WIP: Adding workflow for jwt plugin

Kong · Jul 26, 2023 · 8e5388b · 8e5388b
1 parent b4340a7
commit 8e5388b
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/.github/workflows/stage-changes-for-kong.yaml b/.github/workflows/stage-changes-for-kong.yaml
@@ -107,19 +107,23 @@ jobs:
       - name: Combine Kong Configurations
         # Combine all the previous OAS->Kong configurations into one and put it in a well known place
         run: |
-          cp platform/kong/platform-kong-base.yaml .github/artifacts/kong/
           deck file merge \
-            .github/artifacts/kong/*-kong.yaml \
-            .github/artifacts/kong/platform-kong-base.yaml \
-            -o .github/artifacts/kong/kong-combined.yaml
+            .github/artifacts/kong/*-kong.yaml -o .github/artifacts/kong/kong-combined.yaml
 
       - name: Platform Team Kong Additions
-        # The platform team has their own things to add to the final Kong configuration
+        # The platform team has their own things to add to the final Kong configuration.
+        # The platform-kong-base.yaml is a base file for any platform defaults. It will "win" over
+        # any settings in the domain teams Kong configurations.
         # The platform/kong/.generated/kong.yaml is the final product and is stored in the repository
-        # Storing the generated file in the repo is intentional, it should help with PR reviews, transparency, and debugging
+        # Storing the generated file in the repo is intentional, it should help with PR reviews, transparency, and debugging.
         run: |
-          deck file merge .github/artifacts/kong/kong-combined.yaml platform/kong/plugins/* platform/kong/vaults/* | \
-            deck file patch -o platform/kong/.generated/kong.yaml platform/kong/patches.yaml
+          deck file merge \
+            .github/artifacts/kong/kong-combined.yaml \
+            platform/kong/platform-kong-base.yaml     \
+            platform/kong/consumers/*                 \
+            platform/kong/plugins/*                   \
+            platform/kong/vaults/* |                  \
+          deck file patch -o platform/kong/.generated/kong.yaml platform/kong/patches.yaml
 
       - name: Upload Artifacts
         # Artifacts are the files that are built along the way of the pipeline but are not committed to the repo