APS-3966, APS-4050 - Runtime Groups (#1331)

Author: ikethecoder

.github/workflows/aps-cypress-e2e.yaml

@@ -56,7 +56,7 @@ jobs:
           # Start following logs in the background with continuous output
           docker logs -f cypress-e2e 2>&1 &
           LOG_PID=$!
-          
+
           while true; do
             if [ "$(docker ps -aq -f status=exited -f name=cypress-e2e)" ]; then
               echo "Cypress tests completed."
@@ -120,7 +120,7 @@ jobs:
         with:
           name: astra-scan-results
           path: ${{ github.workspace }}/e2e/cypress/fixtures/state/scanResult.json
-          
+
       - name: Check for failed tests and create Issue
         if: always()
         env:
@@ -163,4 +163,4 @@ jobs:
         env:
           JIRA_EMAIL: ${{ secrets.JIRA_EMAIL }}
           JIRA_API_KEY: ${{ secrets.JIRA_API_KEY }}
-          ASTRA_SCAN_RESULTS: ${{ github.workspace }}/e2e/cypress/fixtures/state/scanResult.json
+          ASTRA_SCAN_RESULTS: ${{ github.workspace }}/e2e/cypress/fixtures/state/scanResult.json

.github/workflows/ci-build-feeders.yaml

@@ -31,6 +31,22 @@ jobs:
 
       - uses: actions/checkout@v2
 
+      - name: Install oc
+        uses: redhat-actions/oc-installer@v1
+        with:
+          version: '4.6'
+
+      - name: Authenticate to silver and set context
+        uses: redhat-actions/oc-login@v1
+        with:
+          openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
+          openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
+
+          # Disables SSL cert checking. Use this if you don't have the certificate authority data.
+          insecure_skip_tls_verify: true
+
+          namespace: ${{ env.OPENSHIFT_NAMESPACE }}
+
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -66,22 +82,6 @@ jobs:
       - name: Push
         run: docker push ${{ steps.docker_meta.outputs.tags }}
 
-      - name: Install oc
-        uses: redhat-actions/oc-installer@v1
-        with:
-          version: '4.6'
-
-      - name: Authenticate and set context
-        uses: redhat-actions/oc-login@v1
-        with:
-          openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
-          openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
-
-          # Disables SSL cert checking. Use this if you don't have the certificate authority data.
-          insecure_skip_tls_verify: true
-
-          namespace: ${{ env.OPENSHIFT_NAMESPACE }}
-
       - name: 'Get Helm'
         if: github.ref != 'refs/heads/dev'
         run: |
@@ -143,7 +143,6 @@ jobs:
           helm repo add bcgov http://bcgov.github.io/helm-charts
           helm upgrade --install proto-asp-${{ steps.set-deploy-id.outputs.DEPLOY_ID }}-feeder -f values.yaml --history-max 3 bcgov/generic-api
 
-
       - name: Authenticate to Gold and set context
         if: github.ref == 'refs/heads/test'
         uses: redhat-actions/oc-login@v1
@@ -157,4 +156,3 @@ jobs:
         if: github.ref == 'refs/heads/test'
         run: |
           oc rollout restart deployment/bcgov-aps-portal-feeder-generic-api -n ${{ secrets.OPENSHIFT_GOLD_TEST_NAMESPACE }}
-

.github/workflows/ci-feat-sonar.yaml

@@ -58,4 +58,3 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          SONAR_HOST_URL: https://sonarcloud.io

e2e/cypress.config.ts

@@ -44,6 +44,7 @@ export default defineConfig({
         './cypress/tests/19-*/*.ts',
         './cypress/tests/20-*/*.ts',
         './cypress/tests/21-*/**/*.ts',
+        './cypress/tests/22-*/**/*.ts',
       ]
       return config
     },

e2e/cypress/support/auth-commands.ts

@@ -463,6 +463,20 @@ Cypress.Commands.add(
   }
 )
 
+Cypress.Commands.add(
+  'makeKongProxyRequest',
+  (serviceName: string, methodType: string, body: any = undefined) => {
+    let authorization
+    return cy.request({
+      url: Cypress.env('KONG_URL'),
+      method: methodType,
+      headers: { Host: `${serviceName}` + '.api.gov.bc.ca' },
+      body: body,
+      failOnStatusCode: false,
+    })
+  }
+)
+
 Cypress.Commands.add(
   'makeKongGatewayRequest',
   (endpoint: string, requestName: string, methodType: string) => {
@@ -569,6 +583,10 @@ Cypress.Commands.add('setRequestBody', (body: any) => {
   requestBody = JSON.stringify(body)
 })
 
+Cypress.Commands.add('clearRequestBody', () => {
+  requestBody = undefined
+})
+
 Cypress.Commands.add('setRequestFormData', (body: FormData) => {
   requestBody = body
 })

e2e/cypress/support/global.d.ts

@@ -26,6 +26,8 @@ declare namespace Cypress {
 
     makeKongRequest(serviceName: string, methodType: string, key?: string): Chainable<any>
 
+    makeKongProxyRequest(serviceName: string, methodType: string): Chainable<any>
+
     makeKongGatewayRequestUsingClientIDSecret(
       hostURL: string,
       methodType?: string
@@ -94,6 +96,8 @@ declare namespace Cypress {
 
     setRequestBody(requestBody: any): void
 
+    clearRequestBody(): void
+
     setQueryString(qs: any): void
 
     setRequestFormData(body: FormData): void

e2e/cypress/support/prep-commands.ts

@@ -14,7 +14,7 @@ Cypress.Commands.add('buildOrgGatewayDatasetAndProduct', (): Cypress.Chainable<a
       name: `ministry-of-kittens-${orgId}`,
       title: 'Some good title about kittens',
       description: 'Some good description about kittens',
-      tags: [],
+      tags: ['member_class:MIN', `member_id:${orgId}`],
       orgUnits: [
         {
           name: `division-of-toys-${orgId}`,
@@ -130,7 +130,7 @@ Cypress.Commands.add('buildOrgGatewayDatasetAndProduct', (): Cypress.Chainable<a
                   organization: {
                     name: org.name,
                     title: 'Some good title about kittens',
-                    tags: [],
+                    tags: ['member_class:MIN', `member_id:${orgId}`],
                     description: 'Some good description about kittens',
                   },
                   organizationUnit: {