Run tests against Kong 1.0 (nokia#95)

* Change tests to run with Kong 1.0 * Add issue template
mtx2d · Jan 26, 2019 · 44e9546 · 44e9546
1 parent 4df820b
commit 44e9546
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 7 deletions.
diff --git a/.env b/.env
@@ -2,6 +2,7 @@ BUILD_IMG_NAME=nokia/kong-oidc
 INTEGRATION_PATH=test/docker/integration
 UNIT_PATH=test/docker/unit
 
+KONG_BASE_TAG=:1.0-centos
 KONG_TAG=
 KONG_DB_TAG=:10.1
 KONG_DB_PORT=5432
@@ -11,7 +12,7 @@ KONG_DB_NAME=kong
 KONG_HTTP_PROXY_PORT=8000
 KONG_HTTP_ADMIN_PORT=8001
 
-KEYCLOAK_TAG=:3.4.0.Final
+KEYCLOAK_TAG=:4.8.3.Final
 KEYCLOAK_PORT=8080
 KEYCLOAK_USER=admin
 KEYCLOAK_PW=password
diff --git a/.github/ ISSUE_TEMPLATE.md b/.github/ ISSUE_TEMPLATE.md
@@ -0,0 +1,9 @@
+1. Used Kong OIDC plugin version:
+
+2. Used Kong version:
+
+3. Kong OIDC plugin configuration:
+
+4. Used OIDC provider:
+
+5. Issue description:
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ env:
   - LUA_VERSION="5.1" KONG_VERSION="0.13.0-0" LUA_RESTY_OPENIDC_VERSION="1.6.0"
   - LUA_VERSION="5.1" KONG_VERSION="0.12.3-0" LUA_RESTY_OPENIDC_VERSION="1.6.0"
   - LUA_VERSION="5.1" KONG_VERSION="0.11.2-0" LUA_RESTY_OPENIDC_VERSION="1.6.0"
+  - LUA_VERSION="5.1" KONG_VERSION="1.0.2-0" LUA_RESTY_OPENIDC_VERSION="1.6.0"
 
 script:
   - sudo -E bash ci/root.sh

diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ Server: kong/0.11.0
 
 ### Upstream API request
 
-The plugin adds a additional `X-Userinfo` header to the upstream request, which can be consumer by upstream server. It contains Userinfo base64 encoded:
+The plugin adds a additional `X-Userinfo`, `X-Access-Token` and `X-Id-Token` headers to the upstream request, which can be consumer by upstream server. All of them are base64 encoded:
 
 ```
 GET / HTTP/1.1
@@ -155,6 +155,8 @@ Accept-Encoding: gzip, deflate
 Accept-Language: pl-PL,pl;q=0.8,en-US;q=0.6,en;q=0.4
 Cookie: session=KOn1am4mhQLKazlCA.....
 X-Userinfo: eyJnaXZlbl9uYW1lIjoixITEmMWaw5PFgcW7xbnEhiIsInN1YiI6ImM4NThiYzAxLTBiM2ItNDQzNy1hMGVlLWE1ZTY0ODkwMDE5ZCIsInByZWZlcnJlZF91c2VybmFtZSI6ImFkbWluIiwibmFtZSI6IsSExJjFmsOTxYHFu8W5xIYiLCJ1c2VybmFtZSI6ImFkbWluIiwiaWQiOiJjODU4YmMwMS0wYjNiLTQ0MzctYTBlZS1hNWU2NDg5MDAxOWQifQ==
+X-Access-Token: eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJGenFSY0N1Ry13dzlrQUJBVng1ZG9sT2ZwTFhBNWZiRGFlVDRiemtnSzZRIn0.eyJqdGkiOiIxYjhmYzlkMC1jMjlmLTQwY2ItYWM4OC1kNzMyY2FkODcxY2IiLCJleHAiOjE1NDg1MTA4MjksIm5iZiI6MCwiaWF0IjoxNTQ4NTEwNzY5LCJpc3MiOiJodHRwOi8vMTkyLjE2OC4wLjk6ODA4MC9hdXRoL3JlYWxtcy9tYXN0ZXIiLCJhdWQiOlsibWFzdGVyLXJlYWxtIiwiYWNjb3VudCJdLCJzdWIiOiJhNmE3OGQ5MS01NDk0LTRjZTMtOTU1NS04NzhhMTg1Y2E0YjkiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJrb25nIiwibm9uY2UiOiJmNGRkNDU2YzBjZTY4ZmFmYWJmNGY4ZDA3YjQ0YWE4NiIsImF1dGhfdGltZSI6…IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6Im9wZW5pZCBwcm9maWxlIGVtYWlsIiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJhZG1pbiJ9.GWuguFjSEDGxw_vbD04UMKxtai15BE2lwBO0YkSzp-NKZ2SxAzl0nyhZxpP0VTzk712nQ8f_If5-mQBf_rqEVnOraDmX5NOXP0B8AoaS1jsdq4EomrhZGqlWmuaV71Cnqrw66iaouBR_6Q0s8bgc1FpCPyACM4VWs57CBdTrAZ2iv8dau5ODkbEvSgIgoLgBbUvjRKz1H0KyeBcXlVSgHJ_2zB9q2HvidBsQEIwTP8sWc6er-5AltLbV8ceBg5OaZ4xHoramMoz2xW-ttjIujS382QQn3iekNByb62O2cssTP3UYC747ehXReCrNZmDA6ecdnv8vOfIem3xNEnEmQw
+X-Id-Token: eyJuYmYiOjAsImF6cCI6ImtvbmciLCJpYXQiOjE1NDg1MTA3NjksImlzcyI6Imh0dHA6XC9cLzE5Mi4xNjguMC45OjgwODBcL2F1dGhcL3JlYWxtc1wvbWFzdGVyIiwiYXVkIjoia29uZyIsIm5vbmNlIjoiZjRkZDQ1NmMwY2U2OGZhZmFiZjRmOGQwN2I0NGFhODYiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJhZG1pbiIsImF1dGhfdGltZSI6MTU0ODUxMDY5NywiYWNyIjoiMSIsInNlc3Npb25fc3RhdGUiOiJiNDZmODU2Ny0zODA3LTQ0YmMtYmU1Mi1iMTNiNWQzODI5MTQiLCJleHAiOjE1NDg1MTA4MjksImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwianRpIjoiMjI1ZDRhNDItM2Y3ZC00Y2I2LTkxMmMtOGNkYzM0Y2JiNTk2Iiwic3ViIjoiYTZhNzhkOTEtNTQ5NC00Y2UzLTk1NTUtODc4YTE4NWNhNGI5IiwidHlwIjoiSUQifQ==
 ```
 
 

diff --git a/bin/build-env.sh b/bin/build-env.sh
@@ -11,14 +11,14 @@
   (set -x
     # Tear down environment if it is running
     docker-compose -f ${INTEGRATION_PATH}/docker-compose.yml down 
-    docker build -t nokia/kong-oidc -f ${INTEGRATION_PATH}/Dockerfile .
+    docker build --build-arg KONG_BASE_TAG=${KONG_BASE_TAG} -t nokia/kong-oidc -f ${INTEGRATION_PATH}/Dockerfile .
     docker-compose -f ${INTEGRATION_PATH}/docker-compose.yml up -d kong-db
   )
 
   _wait_for_listener localhost:${KONG_DB_PORT}
 
   (set -x
-    docker-compose -f ${INTEGRATION_PATH}/docker-compose.yml run --rm kong kong migrations up
+    docker-compose -f ${INTEGRATION_PATH}/docker-compose.yml run --rm kong kong migrations bootstrap
     docker-compose -f ${INTEGRATION_PATH}/docker-compose.yml up -d
   )
 

diff --git a/bin/run-unit-tests.sh b/bin/run-unit-tests.sh
@@ -3,6 +3,7 @@
 
 (set -ex
   docker build \
+    --build-arg KONG_BASE_TAG=${KONG_BASE_TAG} \
     -t ${BUILD_IMG_NAME} \
     -f ${UNIT_PATH}/Dockerfile .
   docker run -it --rm ${BUILD_IMG_NAME} /bin/bash test/unit/run.sh

diff --git a/test/docker/integration/Dockerfile b/test/docker/integration/Dockerfile
@@ -1,4 +1,5 @@
-FROM kong:0.14.1-centos
+ARG KONG_BASE_TAG
+FROM kong${KONG_BASE_TAG}
 
 ENV LUA_PATH /usr/local/share/lua/5.1/?.lua;/usr/local/kong-oidc/?.lua;;
 # For lua-cjson

diff --git a/test/docker/unit/Dockerfile b/test/docker/unit/Dockerfile
@@ -1,4 +1,5 @@
-FROM kong:0.14.1-centos
+ARG KONG_BASE_TAG
+FROM kong${KONG_BASE_TAG}
 
 ENV LUA_PATH /usr/local/share/lua/5.1/?.lua;/usr/local/kong-oidc/?.lua
 # For lua-cjson

diff --git a/test/unit/mockable_case.lua b/test/unit/mockable_case.lua
@@ -23,7 +23,10 @@ function MockableCase:setUp()
     end,
     say = function(...) end,
     exit = function(...) end,
-    redirect = function(...) end
+    redirect = function(...) end,
+    config = {
+      subsystem = "http"
+    }
   }
   self.ngx = _G.ngx
   _G.ngx = self.mocked_ngx