use bcgov-nr action for pr comment

bcgov · Feb 29, 2024 · 7d4cbef · 7d4cbef
1 parent e13b92f
commit 7d4cbef
Show file tree

Hide file tree

Showing 9 changed files with 19,631 additions and 19,692 deletions.
diff --git a/.github/workflows/ci-build-deploy.yaml b/.github/workflows/ci-build-deploy.yaml
@@ -348,20 +348,13 @@ jobs:
           OIDC_CLIENT_SECRET=${{ secrets.OIDC_CLIENT_SECRET }} \
           ./scripts/init.sh
 
-      - name: Comment PR with Portal URL
+      - name: PR Description
         if: startsWith(github.ref, 'refs/heads/feature/')
-        uses: actions/github-script@v6
+        uses: bcgov-nr/action-pr-description-add@v1.1.1
         with:
-          script: |
-            const { owner, repo, number } = context.issue;
-            const commentBody = 'Feature deployment: ' + 'https://api-services-portal-${{ steps.set-deploy-id.outputs.DEPLOY_ID }}.apps.silver.devops.gov.bc.ca';
-            console.log(commentBody)
-            await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number: number,
-              body: commentBody
-            });
+          add_markdown: |
+            ---
+            Feature deployment: ' + 'https://api-services-portal-${{ steps.set-deploy-id.outputs.DEPLOY_ID }}.apps.silver.devops.gov.bc.ca'
 
       - name: Authenticate to Gold and set context
         if: github.ref == 'refs/heads/test'

diff --git a/e2e/cypress.config.ts b/e2e/cypress.config.ts
@@ -37,7 +37,7 @@ export default defineConfig({
     screenshotsFolder: 'results/report/assets',
     video: false,
     testIsolation: false,
-    watchForFileChanges: false,
+    watchForFileChanges: true,
     reporter: 'mochawesome',
     reporterOptions: {
       reportDir: 'results',

diff --git a/e2e/cypress/fixtures/cc-service-gwa.yml b/e2e/cypress/fixtures/cc-service-gwa.yml
@@ -1,19 +1,23 @@
 services:
-- name: cc-service-for-platform
-  host: httpbin.org
-  tags: [ns.ccplatform]
-  port: 443
-  protocol: https
-  retries: 0
-  routes:
-  - name: cc-service-for-platform-route
-    tags: [ns.ccplatform]
-    hosts:
-      - cc-service-for-platform.api.gov.bc.ca
-    paths:
-      - /
-    methods:
-      - GET
-    strip_path: false
-    https_redirect_status_code: 426
-    path_handling: v0
+    -
+        name: cc-service-for-platform
+        host: httpbin.org
+        tags:
+            - ns.
+        port: 443
+        protocol: https
+        retries: 0
+        routes:
+            -
+                name: cc-service-for-platform-route
+                tags:
+                    - ns.
+                hosts:
+                    - cc-service-for-platform.api.gov.bc.ca
+                paths:
+                    - /
+                methods:
+                    - GET
+                strip_path: false
+                https_redirect_status_code: 426
+                path_handling: v0
diff --git a/e2e/cypress/fixtures/common-testdata.json b/e2e/cypress/fixtures/common-testdata.json
@@ -4,7 +4,7 @@
     "namespace": "gw-a9232"
   },
   "clientCredentials": {
-    "namespace": "gw-d2c50"
+    "namespace": "gw-0bce2"
   },
   "namespacePreview": {
     "namespace": "gw-16a3a"

diff --git a/e2e/cypress/fixtures/state/regen.json b/e2e/cypress/fixtures/state/regen.json
@@ -1,5 +1,5 @@
 {
-  "apikey": "qiHHqk9lIzTgP1j94nHp5C1bNVJBOWnG",
+  "apikey": "QgOsAYrvUiOS07friP4SKq3WfW7OHsO8",
   "consumernumber": "B15172D9-F103D11A9A1",
   "clientidsecret": "{\"clientId\": \"A7D72430-52CD37B2420\", \"clientSecret\": \"282718d8-d0c2-45a0-8885-3539f0ca5fea\", \"tokenEndpoint\": \"http://keycloak.localtest.me:9081/auth/realms/master/protocol/openid-connect/token\"}",
   "credentials": "{\"clientId\": \"sa-ccplatform-e0000000-d339cbfcda5e\", \"clientSecret\": \"f5127730-df13-453d-ace0-a30a1255e30d\"}"

diff --git a/e2e/cypress/fixtures/state/store.json b/e2e/cypress/fixtures/state/store.json
@@ -1 +1,4 @@
-{}
+{
+  "clientid": "406CB7CF-93F688060A3",
+  "apikey": "QgOsAYrvUiOS07friP4SKq3WfW7OHsO8"
+}
diff --git a/local/oauth2-proxy/oauth2-proxy-local.cfg b/local/oauth2-proxy/oauth2-proxy-local.cfg
@@ -23,7 +23,8 @@ set_authorization_header="false"
 pass_authorization_header="false"
 skip_auth_regex="/login|/health|/public|/docs|/redirect|/_next|/images|/devportal|/manager|/about|/maintenance|/admin/session|/ds/api|/gw/api|/feed/|/signout|^[/]$"
 whitelist_domains="keycloak.localtest.me:9081"
-upstreams=["http://apsportal.localtest.me:3000"]
+# upstreams=["http://apsportal.localtest.me:3000"]
+upstreams=["http://172.25.20.31:3000"]
 skip_provider_button='true'
 redis_connection_url="redis://redis-master:6379"
 session_store_type='redis'