Few more merge conflicts, couple remaining

Author: Elson9

e2e/cypress/tests/12-access-permission/07-namespace-view.cy.ts

@@ -88,13 +88,8 @@ describe('Verify that Mark is unable to view Gateway summary', () => {
       cy.setHeaders(namespaces.headers)
       cy.setAuthorizationToken(userSession)
       cy.makeAPIRequest(namespaces.endPoint + "/" + nameSpace, 'GET').then((res:any) => {
-<<<<<<< HEAD
           expect(res.apiRes.status).to.be.equal(403)
           expect(res.apiRes.body.message).to.be.contain('Missing required scope')
-=======
-          expect(res.apiRes.status).to.be.equal(401)
-          expect(res.apiRes.body.message).to.be.contain('Missing authorization scope')
->>>>>>> dev
       })
     })
   })

local/kong/Dockerfile

@@ -5,25 +5,18 @@ USER root
 
 RUN apt-get update && apt-get -y install unzip curl && apt-get clean
 
-<<<<<<< HEAD
 RUN git clone -b feature/mtls https://github.com/bcgov/kong-oss-plugins.git \
   && cd kong-oss-plugins \
   && (cd plugins/dpop && luarocks make) \
   && (cd plugins/jwt-keycloak && luarocks make) \
   && (cd plugins/mtls-acl && luarocks make) \
   && (cd plugins/mtls-auth && luarocks make) \
-=======
-RUN git clone https://github.com/bcgov/kong-oss-plugins.git \
-  && cd kong-oss-plugins \
-  && (cd plugins/jwt-keycloak && luarocks make) \
->>>>>>> dev
   && (cd plugins/oidc && luarocks make kong-plugin-oidc-1.5.0-2.rockspec) \
   && (cd plugins/oidc && \
      case "${KONG_VERSION}" in \
          (3*) luarocks build --deps-only kong-plugin-oidc-deps-k3-1.5.0-2.rockspec;; \
          (*)  luarocks build --deps-only kong-plugin-oidc-deps-k2-1.5.0-2.rockspec;; \
      esac) \
-<<<<<<< HEAD
   && (cd plugins/oidc-consumer && luarocks make) \
   && (cd plugins/openid-authzen && luarocks make) \
   && (cd plugins/response-signer && luarocks make) \
@@ -33,9 +26,6 @@ RUN git clone https://github.com/bcgov/kong-oss-plugins.git \
   && (cd plugins/trust-timestamp && luarocks make) \
   && (cd plugins/trust-verify-digest && luarocks make) \
   && (cd plugins/trust-verify-signature && luarocks make)
-=======
-  && (cd plugins/oidc-consumer && luarocks make)
->>>>>>> dev
 
 RUN git clone -b kong3 https://github.com/bcgov/gwa-kong-endpoint.git \
   && (cd gwa-kong-endpoint && ./devBuild.sh)
@@ -56,12 +46,8 @@ RUN git clone https://github.com/Kong/priority-updater.git \
 
 USER kong
 
-<<<<<<< HEAD
 # ============================================
 # Plugins Configuration
 # ============================================
 # Enables bundled plugins plus custom authentication, rate limiting, and security plugins
 ENV KONG_PLUGINS="bundled, jwt-keycloak_1010, rate-limiting_902, pre-function_770, post-function_200, post-function_201, oidc, oidc-consumer, kong-spec-expose, jwt-keycloak, kong-upstream-jwt, bcgov-gwa-endpoint, gwa-ip-anonymity, mtls-auth, mtls-acl, openid-authzen, response-signer, dpop, token-exchange, trust-ledger, trust-sign, trust-timestamp, trust-verify-digest, trust-verify-signature"
-=======
-ENV KONG_PLUGINS="bundled, jwt-keycloak_1010, rate-limiting_902, pre-function_770, post-function_200, post-function_201, oidc, oidc-consumer, kong-spec-expose, kong-upstream-jwt, jwt-keycloak, kong-upstream-jwt, bcgov-gwa-endpoint, gwa-ip-anonymity"
->>>>>>> dev