From 54ee114eb3cd9471488bebffaa9f7d3368a41267 Mon Sep 17 00:00:00 2001 From: Eric Weidow <85724887+Studsministern@users.noreply.github.com> Date: Fri, 31 May 2024 11:18:06 +0200 Subject: [PATCH 1/4] import URL secret from vault in deploy job --- .github/workflows/docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 42dc4aa7..ccab8988 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -242,6 +242,7 @@ jobs: kv/data/${{ needs.env-vars.outputs.basename }}/${{ needs.env-vars.outputs.env }} JWT_SECRET; kv/data/${{ needs.env-vars.outputs.basename }}/${{ needs.env-vars.outputs.env }} EBREV; kv/data/${{ needs.env-vars.outputs.basename }}/${{ needs.env-vars.outputs.env }} EBREV_API_TOKEN; + kv/data/${{ needs.env-vars.outputs.basename }}/${{ needs.env-vars.outputs.env }} PDF_TO_PNG_BASE_URL; - name: set variables run: | echo "IMAGE_NAME=${{ needs.env-vars.outputs.image_name }}" >> $GITHUB_ENV From 913850edc1b18159b61ba2c1e31d58d8f10dfa1a Mon Sep 17 00:00:00 2001 From: Eric Weidow <85724887+Studsministern@users.noreply.github.com> Date: Fri, 31 May 2024 13:16:52 +0200 Subject: [PATCH 2/4] add secret to docker-compose.ci.yml --- docker-compose.ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index ac91029e..f39f0e7d 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -14,6 +14,7 @@ services: - JWT_SECRET - EBREV - EBREV_API_TOKEN + - PDF_TO_PNG_BASE_URL networks: - traefik - default # to join compose network From c5536c7242af2015a09c5183cac77c2305c67efa Mon Sep 17 00:00:00 2001 From: Eric Weidow <85724887+Studsministern@users.noreply.github.com> Date: Fri, 31 May 2024 13:27:07 +0200 Subject: [PATCH 3/4] update CHANGELOG.md --- CHANGELOG.MD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 2bbe7c4a..50a2e324 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -5,7 +5,7 @@ Alla märkbara ändringar ska dokumenteras i denna fil. Baserat på [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), och följer [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.10.0] - 2024-04-29 +## [1.10.0] - 2024-05-31 ### Tillagt @@ -20,6 +20,7 @@ och följer [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Enhetstest för Hehe som kontrollerar att en felaktig filtyp inte kan laddas upp - Enhetstester för `paginatedHehes` - Enhetstester för `createPageInfo` +- Environment-variabeln `PDF_TO_PNG_BASE_URL` ### Ändrat From ded39833a831b74bda3d79aa51dab8407add0714 Mon Sep 17 00:00:00 2001 From: Eric Weidow <85724887+Studsministern@users.noreply.github.com> Date: Fri, 31 May 2024 14:14:37 +0200 Subject: [PATCH 4/4] fix hehe test case --- test/integration/hehe.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/integration/hehe.test.ts b/test/integration/hehe.test.ts index c293f117..d88c795e 100644 --- a/test/integration/hehe.test.ts +++ b/test/integration/hehe.test.ts @@ -5,7 +5,6 @@ import { HeheAPI } from '@api/hehe'; import { AccessType, Feature, File, FileType } from '@generated/graphql'; import { removeUploadedFiles, UploadFileOptions, baseUploadFile } from '@test/utils/fileUpload'; import { genRandomUser } from '@test/utils/utils'; -import path from 'path'; import request from 'supertest'; const heheApi = new HeheAPI(); @@ -66,5 +65,5 @@ test('create HeHE cover image from PDF', async () => { }); // Cover test file must be deleted manually as it is not created by the uploadFile function - fileApi.deleteFile(coverId); + await fileApi.deleteFile(coverId); });