From 312940761cd1111366afd26ce966aa480dd1557d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 22 Apr 2020 19:16:04 +0200 Subject: [PATCH 1/3] Enabling HTTPS in test deployment --- deeployer.libsonnet | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/deeployer.libsonnet b/deeployer.libsonnet index 7927dd5a..105f9025 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -7,7 +7,8 @@ "back": { "image": "thecodingmachine/workadventure-back:"+tag, "host": { - "url": "api."+namespace+".workadventure.test.thecodingmachine.com" + "url": "api."+namespace+".workadventure.test.thecodingmachine.com", + "https": "enable" }, "ports": [8080], "env": { @@ -17,12 +18,18 @@ "front": { "image": "thecodingmachine/workadventure-front:"+tag, "host": { - "url": namespace+".workadventure.test.thecodingmachine.com" + "url": namespace+".workadventure.test.thecodingmachine.com", + "https": "enable" }, "ports": [80], "env": { "API_URL": "http://api."+namespace+".workadventure.test.thecodingmachine.com" } } + }, + "config": { + "https": { + "mail": "d.negrier@thecodingmachine.com" + } } } From 321254bc2cd5f8ceed7f083d0e21dca3c89e55ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 22 Apr 2020 23:27:30 +0200 Subject: [PATCH 2/3] Fixing API link to HTTPS --- deeployer.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deeployer.libsonnet b/deeployer.libsonnet index 105f9025..84ea3eca 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -23,7 +23,7 @@ }, "ports": [80], "env": { - "API_URL": "http://api."+namespace+".workadventure.test.thecodingmachine.com" + "API_URL": "https://api."+namespace+".workadventure.test.thecodingmachine.com" } } }, From 6a349e3ef71e12b11abc86ea8823d95b00f39854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 22 Apr 2020 23:34:56 +0200 Subject: [PATCH 3/3] Switching tests on https too --- .github/workflows/build-and-deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 6f6ebe8a..88bd4543 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -81,17 +81,17 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - msg: Environment deployed at http://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com + msg: Environment deployed at https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com check_for_duplicate_msg: true - name: Run Cypress tests uses: cypress-io/github-action@v1 env: - CYPRESS_BASE_URL: http://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com + CYPRESS_BASE_URL: https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com with: env: host=${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com,port=80 spec: cypress/integration/spec.js - wait-on: http://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com + wait-on: https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com working-directory: e2e - name: "Upload the screenshot on test failure"