Skip to content

Commit 3aea162

Browse files
authored
Cypress kong plugins (#1227)
1 parent 7aab646 commit 3aea162

File tree

2 files changed

+15
-35
lines changed

2 files changed

+15
-35
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,4 @@ jobs:
161161
env:
162162
JIRA_EMAIL: ${{ secrets.JIRA_EMAIL }}
163163
JIRA_API_KEY: ${{ secrets.JIRA_API_KEY }}
164-
ASTRA_SCAN_RESULTS: ${{ github.workspace }}/e2e/cypress/fixtures/state/scanResult.json
164+
ASTRA_SCAN_RESULTS: ${{ github.workspace }}/e2e/cypress/fixtures/state/scanResult.json

local/kong/Dockerfile

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,30 @@
1-
FROM kong:2.8.3
1+
FROM docker.io/kong:2.8.5
22

33
USER root
44

5-
RUN apk add git ethtool strace
5+
RUN apk add git ethtool strace unzip
66

7-
ARG PLUGIN_VERSION=1.1.1-1
8-
ARG PLUGIN_OIDC_VERSION=1.2.4-2
9-
ARG PLUGIN_OIDC_CONSUMER_VERSION=0.0.1-0
10-
ARG PLUGIN_UPSTREAM_BASIC_VERSION=1.0.0-1
11-
ARG FORCE_BUILD=8
7+
RUN git clone -b v1.5.0-1 https://github.com/bcgov/kong-oss-plugins.git \
8+
&& cd kong-oss-plugins/plugins \
9+
&& (cd jwt-keycloak && luarocks make) \
10+
&& (cd oidc && luarocks make) \
11+
&& (cd oidc-consumer && luarocks make)
1212

13-
RUN git clone https://github.com/ikethecoder/kong-plugin-upstream-auth-basic.git
14-
RUN (cd kong-plugin-upstream-auth-basic && luarocks make && luarocks pack kong-plugin-upstream-auth-basic ${PLUGIN_UPSTREAM_BASIC_VERSION})
15-
16-
RUN luarocks install lua-resty-openidc
17-
RUN git clone -b v${PLUGIN_OIDC_VERSION} https://github.com/revomatico/kong-oidc.git
18-
RUN (cd kong-oidc && luarocks make && luarocks pack kong-oidc ${PLUGIN_OIDC_VERSION})
19-
20-
RUN git clone https://github.com/ikethecoder/kong-oidc-consumer.git
21-
RUN (cd kong-oidc-consumer && luarocks make && luarocks pack kong-oidc-consumer ${PLUGIN_OIDC_CONSUMER_VERSION})
22-
23-
RUN git clone -b kong28 https://github.com/ikethecoder/kong-plugin-jwt-keycloak.git
24-
RUN (cd kong-plugin-jwt-keycloak && luarocks make && luarocks pack kong-plugin-jwt-keycloak ${PLUGIN_VERSION})
25-
26-
RUN git clone -b feature/kong-2.0-upgrade https://github.com/bcgov/gwa-kong-endpoint.git
13+
RUN git clone https://github.com/bcgov/gwa-kong-endpoint.git
2714
RUN (cd gwa-kong-endpoint && ./devBuild.sh)
2815

29-
RUN git clone -b hotfix/ips-not-always-string https://github.com/bcgov/gwa-ip-anonymity.git
16+
RUN git clone https://github.com/bcgov/gwa-ip-anonymity.git
3017
RUN (cd gwa-ip-anonymity && ./devBuild.sh)
3118

32-
RUN luarocks install lua-resty-jwt 0.2.2-0 \
33-
&& luarocks install lua-resty-session 2.26-1 \
34-
&& luarocks install lua-resty-openidc 1.7.5-1 \
35-
&& luarocks install kong-spec-expose \
36-
&& luarocks install kong-upstream-jwt \
37-
&& luarocks install kong-plugin-referer \
38-
&& luarocks install kong-upstream-jwt \
39-
&& luarocks install kong-oidc/kong-oidc-${PLUGIN_OIDC_VERSION}.all.rock \
40-
&& luarocks install kong-plugin-upstream-auth-basic/kong-plugin-upstream-auth-basic-${PLUGIN_UPSTREAM_BASIC_VERSION}.all.rock \
41-
&& luarocks install kong-oidc-consumer/kong-oidc-consumer-${PLUGIN_OIDC_CONSUMER_VERSION}.all.rock \
42-
&& luarocks install kong-plugin-jwt-keycloak/kong-plugin-jwt-keycloak-${PLUGIN_VERSION}.all.rock
19+
RUN luarocks install kong-spec-expose \
20+
&& luarocks install kong-plugin-referer \
21+
&& luarocks install kong-upstream-jwt
4322

4423
RUN git clone https://github.com/Kong/priority-updater.git
4524
RUN (cd priority-updater/template/plugin && KONG_PRIORITY=902 KONG_PRIORITY_NAME=rate-limiting /usr/local/openresty/luajit/bin/luajit ../priority.lua)
4625
RUN (cd priority-updater/template/plugin && KONG_PRIORITY=1010 KONG_PRIORITY_NAME=jwt-keycloak /usr/local/openresty/luajit/bin/luajit ../priority.lua)
26+
RUN (cd priority-updater/template/plugin && KONG_PRIORITY=200 KONG_PRIORITY_NAME=post-function /usr/local/openresty/luajit/bin/luajit ../priority.lua)
4727

4828
USER kong
4929

50-
ENV KONG_PLUGINS="bundled, jwt-keycloak_1010, rate-limiting_902, oidc, oidc-consumer, bcgov-gwa-endpoint, gwa-ip-anonymity, kong-spec-expose, kong-upstream-jwt, referer, jwt-keycloak, kong-upstream-jwt, upstream-auth-basic"
30+
ENV KONG_PLUGINS="bundled, jwt-keycloak_1010, rate-limiting_902, post-function_200, oidc, oidc-consumer, bcgov-gwa-endpoint, gwa-ip-anonymity, kong-spec-expose, kong-upstream-jwt, referer, jwt-keycloak, kong-upstream-jwt"

0 commit comments

Comments
 (0)