Skip to content

Commit e8b065f

Browse files
authored
Merge branch 'main' into release/gateway-3.12.0.2
2 parents 1cd95a1 + 2961f66 commit e8b065f

File tree

57 files changed

+7058
-5386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+7058
-5386
lines changed

.github/styles/base/Dictionary.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ unescaped
870870
ungroup
871871
ungrouped
872872
Unicode
873-
Unicode
873+
unicode
874874
unix
875875
unmanaged
876876
unmarshalled

.github/workflows/automated-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- '3.12'
2121
steps:
2222
- name: Harden Runner
23-
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
23+
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
2424
with:
2525
egress-policy: audit
2626

.github/workflows/build-automated-tests-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Harden Runner
10-
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
10+
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
1111
with:
1212
egress-policy: audit
1313

.github/workflows/check-for-changes-in-docs-repo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
timeout-minutes: 30
1616
steps:
1717
- name: Harden Runner
18-
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
18+
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
1919
with:
2020
egress-policy: audit
2121
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5

.github/workflows/check-links-scheduled.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Harden Runner
19-
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
19+
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
2020
with:
2121
egress-policy: audit
2222
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5

.github/workflows/check-links.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
timeout-minutes: 10
1616
steps:
1717
- name: Harden Runner
18-
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
18+
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
1919
with:
2020
egress-policy: audit
2121
- name: Check if manual review has been performed
@@ -37,7 +37,7 @@ jobs:
3737
timeout-minutes: 30
3838
steps:
3939
- name: Harden Runner
40-
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
40+
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
4141
with:
4242
egress-policy: audit
4343
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5

.github/workflows/event-gateway-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Harden Runner
25-
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
25+
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
2626
with:
2727
egress-policy: audit
2828

.github/workflows/gateway-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Harden Runner
27-
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
27+
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
2828
with:
2929
egress-policy: audit
3030

.github/workflows/generate-gateway-plugins-changelogs.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ on:
1212
required: true
1313
default: 'main'
1414
type: string
15+
dev_site_base_branch:
16+
description: 'Dev site base branch, e.g. main'
17+
required: true
18+
type: string
1519
release_date:
1620
description: 'Release date for the version (YYYY/MM/DD format). Only used when version is specified.'
1721
required: true
@@ -28,12 +32,12 @@ jobs:
2832
timeout-minutes: 30
2933
steps:
3034
- name: Harden Runner
31-
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
35+
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
3236
with:
3337
egress-policy: audit
3438

3539
- name: Create GitHub App Token
36-
uses: actions/create-github-app-token@d7ee28121512479a18a428398f948ac5ce15fb4c
40+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf
3741
id: app-token
3842
with:
3943
app-id: ${{ vars.GH_APP_KONG_DOCS_ID }}
@@ -120,6 +124,7 @@ jobs:
120124
labels: skip-changelog,review:general
121125
token: ${{ steps.app-token.outputs.token }}
122126
branch: auto/generate-gateway-plugins-changelogs-${{ github.run_number }}
127+
base: ${{ inputs.dev_site_base_branch }}
123128

124129
- name: No changes detected
125130
if: steps.changes.outputs.changed == 'false'
Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
name: Generate Kong Configuration JSON
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: 'Kong version to generate config for (e.g., 3.9)'
8+
required: true
9+
type: string
10+
kong_ee_branch:
11+
description: 'Branch to use from kong-ee repository'
12+
required: true
13+
default: 'main'
14+
type: string
15+
dev_site_base_branch:
16+
description: 'Dev site base branch, e.g. main'
17+
required: true
18+
type: string
19+
kong_conf_path:
20+
description: 'Path to kong.conf file in kong-ee repo (relative to repo root)'
21+
required: false
22+
default: 'kong.conf.default'
23+
type: string
24+
25+
permissions:
26+
contents: write
27+
pull-requests: write
28+
29+
jobs:
30+
generate-kong-conf-json:
31+
name: Generate Kong Configuration JSON
32+
runs-on: ubuntu-latest
33+
timeout-minutes: 20
34+
steps:
35+
- name: Harden Runner
36+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
37+
with:
38+
egress-policy: audit
39+
40+
- name: Checkout developer.konghq.com
41+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
42+
with:
43+
token: ${{ secrets.PAT }}
44+
45+
- name: Setup Node.js
46+
uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
47+
with:
48+
node-version: '18'
49+
cache: 'npm'
50+
cache-dependency-path: tools/kong-conf-to-json/package-lock.json
51+
52+
- name: Install kong-conf-to-json dependencies
53+
run: |
54+
cd tools/kong-conf-to-json
55+
npm ci
56+
57+
- name: Checkout kong-ee repository
58+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
59+
with:
60+
repository: 'Kong/kong-ee'
61+
token: ${{ secrets.PAT }}
62+
path: 'kong-ee'
63+
ref: ${{ inputs.kong_ee_branch }}
64+
65+
- name: Create kong-conf data directory
66+
run: |
67+
mkdir -p app/_data/kong-conf
68+
69+
- name: Generate kong.conf JSON
70+
run: |
71+
cd tools/kong-conf-to-json
72+
node run.js --file="../../kong-ee/${{ inputs.kong_conf_path }}" --version="${{ inputs.version }}"
73+
74+
- name: Generate index file
75+
run: |
76+
cd tools/kong-conf-to-json
77+
node index-file.js
78+
79+
- name: Check for changes
80+
id: changes
81+
run: |
82+
if git diff --quiet; then
83+
echo "changed=false" >> $GITHUB_OUTPUT
84+
else
85+
echo "changed=true" >> $GITHUB_OUTPUT
86+
fi
87+
88+
- name: Create pull request
89+
if: steps.changes.outputs.changed == 'true'
90+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7
91+
with:
92+
title: Generate Kong configuration JSON for version ${{ inputs.version }}
93+
commit-message: Generate Kong configuration JSON for version ${{ inputs.version }}
94+
body: |
95+
**Changes:**
96+
- Generated JSON representation of kong.conf file
97+
- Updated kong-conf index file with version information
98+
- Processed Kong version ${{ inputs.version }}
99+
100+
labels: skip-changelog,review:general
101+
token: ${{ secrets.PAT }}
102+
branch: auto/generate-kong-conf-json-${{ github.run_number }}
103+
base: ${{ inputs.dev_site_base_branch }}
104+
105+
- name: No changes detected
106+
if: steps.changes.outputs.changed == 'false'
107+
run: |
108+
echo "No changes detected in the kong-conf JSON files. No pull request will be created."

0 commit comments

Comments
 (0)