Improved configuration parameter validation (#36)

* Added simple check, not starting with http:// or https:// * Update publish-rock.yml * Update build.yml * Update publish-rock.yml
LEGO · Feb 20, 2024 · 0250a5a · 0250a5a
1 parent db757b7
commit 0250a5a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           args: kong spec
   unit-tests:
-    needs: linting 
+    needs: linting
     name: Running unit tests.
     runs-on: ubuntu-latest
     steps:
@@ -40,4 +40,13 @@ jobs:
       - run: luarocks make
 
       - name: luarocks pack
-        run: luarocks pack $(find . -maxdepth 1 -name "kong-aws-request-signing-*.rockspec" -print | sed 's/.\///g' | sed 's/.rockspec//g' | sed 's/signing-/signing /g')
+        run: luarocks pack $(find . -maxdepth 1 -name "kong-aws-request-signing-*.rockspec" -print | sed 's/.\///g' | sed 's/.rockspec//g' | sed 's/signing-/signing /g')
+
+      - name: get version
+        id: version
+        run: echo "version=$(luarocks show aws-request-signing --mversion)" >> "$GITHUB_OUTPUT"
+
+      - name: Echo version
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+        run: echo $VERSION
diff --git a/.github/workflows/publish-rock.yml b/.github/workflows/publish-rock.yml
@@ -5,7 +5,7 @@ on:
     paths:
       - "*.rockspec"
   workflow_dispatch:
-    
+
 
 jobs:
   build_rock:
@@ -19,14 +19,18 @@ jobs:
 
       - name: luarocks pack
         run: luarocks pack $(find . -maxdepth 1 -name "kong-aws-request-signing-*.rockspec" -print | sed 's/.\///g' | sed 's/.rockspec//g' | sed 's/signing-/signing /g')
-
+
+      - name: get version
+        id: version
+        run: echo "version=$(luarocks show aws-request-signing --mversion)" >> "$GITHUB_OUTPUT"
+
       - name: Get token to commit
         id: get_token
         uses: peter-murray/[email protected]
         with:
           application_id: ${{ secrets.APP_GITHUB_100101_ID }} #Org app id
           application_private_key: ${{ secrets.APP_GITHUB_100101_PRIVATE_KEY }} #Org app secret
-      
+
       - name: Commit the rock
         env:
           GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
@@ -42,4 +46,11 @@ jobs:
             --field content="$CONTENT" \
             --field encoding="base64" \
             --field branch="$DESTINATION_BRANCH" \
-            --field sha="$SHA"
+            --field sha="$SHA"
+
+      - name: Create a GitHub release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.version.outputs.version }}
+          name: Release ${{ steps.version.outputs.version }}
+          token: ${{ steps.get_token.outputs.token }}
diff --git a/kong-aws-request-signing-1.0.3-3.rockspec → kong-aws-request-signing-1.0.4-3.rockspec b/kong-aws-request-signing-1.0.3-3.rockspec → kong-aws-request-signing-1.0.4-3.rockspec
@@ -1,6 +1,6 @@
 local plugin_name = "aws-request-signing"
 local package_name = "kong-" .. plugin_name
-local package_version = "1.0.3"
+local package_version = "1.0.4"
 local rockspec_revision = "3"
 
 local github_account_name = "LEGO"

diff --git a/kong/plugins/aws-request-signing/handler.lua b/kong/plugins/aws-request-signing/handler.lua
@@ -175,6 +175,6 @@ function AWSLambdaSTS:access(conf)
 end
 
 AWSLambdaSTS.PRIORITY = 110
-AWSLambdaSTS.VERSION = "1.0.3"
+AWSLambdaSTS.VERSION = "1.0.4"
 
 return AWSLambdaSTS
diff --git a/kong/plugins/aws-request-signing/schema.lua b/kong/plugins/aws-request-signing/schema.lua
@@ -33,7 +33,8 @@ return {
           required = true,
         } },
         { override_target_host = {
-          type = "string"
+          type = "string",
+          not_match = "^https?://"
         } },
         { override_target_port = {
           type = "number"