Skip to content

Commit a7ff4b2

Browse files
aphralGaphralG
committed
Merge branch 'main' into add-attribute-to-request-metrics
2 parents 4380952 + 2769a8d commit a7ff4b2

23 files changed

+627
-190
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
env:
3131
GOPROXY: "https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev"
3232
steps:
33-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
33+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434
with:
3535
fetch-tags: 'true'
3636
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
@@ -45,7 +45,7 @@ jobs:
4545
name: Lint
4646
runs-on: ubuntu-22.04
4747
steps:
48-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
48+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4949
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
5050
with:
5151
go-version-file: 'go.mod'
@@ -61,7 +61,7 @@ jobs:
6161
permissions:
6262
contents: write
6363
steps:
64-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
64+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6565
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
6666
with:
6767
go-version-file: 'go.mod'
@@ -81,7 +81,7 @@ jobs:
8181
name: Unit tests with race condition detection
8282
runs-on: ubuntu-22.04
8383
steps:
84-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
84+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
8585
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
8686
with:
8787
go-version-file: 'go.mod'
@@ -93,7 +93,7 @@ jobs:
9393
name: Build Unsigned Snapshot
9494
runs-on: ubuntu-22.04
9595
steps:
96-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
96+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9797
with:
9898
fetch-tags: 'true'
9999
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
@@ -126,13 +126,13 @@ jobs:
126126
- image: "alpine"
127127
version: "3.22"
128128
steps:
129-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
129+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
130130
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
131131
with:
132132
go-version-file: 'go.mod'
133133
cache: false
134134
- name: Download Packages
135-
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
135+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
136136
with:
137137
name: nginx-agent-unsigned-snapshots
138138
path: build
@@ -170,13 +170,13 @@ jobs:
170170
- image: "alpine"
171171
version: "3.22"
172172
steps:
173-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
173+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
174174
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
175175
with:
176176
go-version-file: 'go.mod'
177177
cache: false
178178
- name: Download Packages
179-
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
179+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
180180
with:
181181
name: nginx-agent-unsigned-snapshots
182182
path: build
@@ -221,13 +221,13 @@ jobs:
221221
version: "mainline"
222222
release: "alpine"
223223
steps:
224-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
224+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
225225
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
226226
with:
227227
go-version-file: 'go.mod'
228228
cache: false
229229
- name: Download Packages
230-
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
230+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
231231
with:
232232
name: nginx-agent-unsigned-snapshots
233233
path: build
@@ -262,40 +262,40 @@ jobs:
262262
matrix:
263263
container:
264264
- image: "alpine"
265-
version: "3.20"
266-
plus: "r32"
265+
version: "3.22"
266+
plus: "r35"
267267
release: "alpine"
268268
path: "/nginx-plus/agent"
269269
- image: "alpine"
270-
version: "3.19"
271-
plus: "r31"
270+
version: "3.21"
271+
plus: "r34"
272272
release: "alpine"
273273
path: "/nginx-plus/agent"
274274
- image: "debian"
275275
version: "bookworm"
276-
plus: "r32"
276+
plus: "r35"
277277
release: "debian"
278278
path: "/nginx-plus/agent"
279279
- image: "debian"
280280
version: "bookworm"
281-
plus: "r31"
281+
plus: "r34"
282282
release: "debian"
283283
path: "/nginx-plus/agent"
284284
steps:
285-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
285+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
286286
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
287287
with:
288288
go-version-file: 'go.mod'
289289
cache: false
290290
- name: Download Packages
291-
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
291+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
292292
with:
293293
name: nginx-agent-unsigned-snapshots
294294
path: build
295295
- name: Login to Docker Registry
296296
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
297297
with:
298-
registry: ${{ secrets.REGISTRY_URL }}
298+
registry: ${{ secrets.TEST_REGISTRY_URL }}
299299
username: ${{ secrets.REGISTRY_USERNAME }}
300300
password: ${{ secrets.REGISTRY_PASSWORD }}
301301

@@ -310,9 +310,10 @@ jobs:
310310
- name: Run Integration Tests
311311
run: |
312312
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
313-
CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.REGISTRY_URL }}" \
313+
CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.TEST_REGISTRY_URL }}" \
314314
TAG="${{ matrix.container.plus }}-${{ matrix.container.image }}-${{ matrix.container.version }}" \
315315
OS_RELEASE="${{ matrix.container.release }}" OS_VERSION="${{ matrix.container.version }}" IMAGE_PATH="${{ matrix.container.path }}" \
316+
NGINX_LICENSE_JWT='${{ secrets.TEST_JWT }}' \
316317
make official-image-integration-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}}/raw_logs.log
317318
exit "${PIPESTATUS[0]}"
318319
@@ -326,7 +327,7 @@ jobs:
326327
permissions:
327328
contents: write
328329
steps:
329-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
330+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
330331
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
331332
with:
332333
go-version-file: 'go.mod'
@@ -358,14 +359,14 @@ jobs:
358359
needs: build-unsigned-snapshot
359360

360361
steps:
361-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
362+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
362363
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
363364
with:
364365
go-version-file: 'go.mod'
365366
cache: false
366367

367368
- name: Download Packages
368-
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
369+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
369370
with:
370371
name: nginx-agent-unsigned-snapshots
371372
path: build

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
docs_only: ${{ github.event.pull_request && steps.docs.outputs.docs_only == 'true' }}
3333
steps:
3434
- name: Checkout Repository
35-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
35+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3636
with:
3737
fetch-depth: 0
3838

‎.github/workflows/dependency-review.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
pull-requests: write # for actions/dependency-review-action to post comments
2323
steps:
2424
- name: "Checkout Repository"
25-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
25+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2626

2727
- name: "Dependency Review"
28-
uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2
28+
uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
2929
with:
3030
config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"

‎.github/workflows/release-branch.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
create_pull_request: ${{steps.vars.outputs.create_pull_request }}
6868
steps:
6969
- name: Checkout Repository
70-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
70+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7171
with:
7272
ref: ${{ inputs.releaseBranch }}
7373

@@ -91,12 +91,12 @@ jobs:
9191
release_id: ${{ steps.vars.outputs.RELEASE_ID }}
9292
steps:
9393
- name: Checkout Repository
94-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
94+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9595
with:
9696
ref: ${{ inputs.releaseBranch }}
9797

9898
- name: Setup Node Environment
99-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
99+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
100100

101101
- name: Create Draft Release
102102
if: ${{ needs.vars.outputs.github_release == 'true' }}
@@ -188,7 +188,7 @@ jobs:
188188
contents: write
189189
steps:
190190
- name: Checkout Repository
191-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
191+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
192192
with:
193193
ref: ${{ inputs.releaseBranch }}
194194

@@ -213,7 +213,7 @@ jobs:
213213
contents: write # Needed to update a github release
214214
steps:
215215
- name: Checkout Repository
216-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
216+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
217217
with:
218218
ref: ${{ inputs.releaseBranch }}
219219

@@ -294,7 +294,7 @@ jobs:
294294
pull-requests: write
295295
steps:
296296
- name: Checkout Repository
297-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
297+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
298298
with:
299299
ref: ${{ inputs.releaseBranch }}
300300

‎.github/workflows/scorecards.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: "Checkout code"
31-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
31+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3232
with:
3333
persist-credentials: false
3434

@@ -55,6 +55,6 @@ jobs:
5555

5656
# Upload the results to GitHub's code scanning dashboard.
5757
- name: "Upload to code-scanning"
58-
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
58+
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
5959
with:
6060
sarif_file: results.sarif

‎.github/workflows/upload-release-assets.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
upload_azure: ${{steps.vars.outputs.upload_azure }}
3737
steps:
3838
- name: Checkout Repository
39-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
39+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4040
with:
4141
ref: ${{ inputs.releaseBranch }}
4242

@@ -53,7 +53,7 @@ jobs:
5353
needs: [vars]
5454
steps:
5555
- name: Checkout Repository
56-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
56+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5757
with:
5858
ref: ${{ inputs.releaseBranch }}
5959

‎.nfpm.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ apk:
5151
signature:
5252
key_file: ".key.rsa"
5353
scripts:
54-
postupgrade: "./scripts/packages/postupgrade.sh"
54+
preupgrade: "./scripts/packages/preinstall.sh"
55+
postupgrade: "./scripts/packages/postinstall.sh"
5556
scripts:
5657
preinstall: "./scripts/packages/preinstall.sh"
5758
postinstall: "./scripts/packages/postinstall.sh"

‎Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ DOCKERFILE_PATH = "./test/docker/nginx-oss/$(CONTAINER_OS_TYPE)/Dockerfile"
3434
OFFICIAL_IMAGE_DOCKERFILE_PATH = "./test/docker/nginx-official-image/$(CONTAINER_OS_TYPE)/Dockerfile"
3535
IMAGE_PATH ?= "/nginx/agent"
3636
TAG ?= ""
37+
NGINX_LICENSE_JWT ?= ""
3738

3839
BUILD_DIR := build
3940
TEST_BUILD_DIR := build/test
@@ -67,6 +68,7 @@ DEB_PACKAGE := ./build/$(PACKAGE_NAME).deb
6768
RPM_PACKAGE := ./build/$(PACKAGE_NAME).rpm
6869

6970
MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
71+
MOCK_MANAGEMENT_PLANE_EXTERNAL_FILE_SERVER ?=
7072
MOCK_MANAGEMENT_PLANE_LOG_LEVEL ?= INFO
7173
MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS ?= 127.0.0.1:0
7274
MOCK_MANAGEMENT_PLANE_API_ADDRESS ?= 127.0.0.1:0
@@ -177,6 +179,7 @@ official-image-integration-test: $(SELECTED_PACKAGE) build-mock-management-plane
177179
TEST_ENV="Container" CONTAINER_OS_TYPE=$(CONTAINER_OS_TYPE) CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} BUILD_TARGET="install" \
178180
PACKAGES_REPO=$(OSS_PACKAGES_REPO) TAG=${TAG} PACKAGE_NAME=$(PACKAGE_NAME) BASE_IMAGE=$(BASE_IMAGE) DOCKERFILE_PATH=$(OFFICIAL_IMAGE_DOCKERFILE_PATH) \
179181
OS_VERSION=$(OS_VERSION) OS_RELEASE=$(OS_RELEASE) IMAGE_PATH=$(IMAGE_PATH) \
182+
NGINX_LICENSE_JWT=$(NGINX_LICENSE_JWT) \
180183
go test -v ./test/integration/managementplane ./test/integration/auxiliarycommandserver
181184

182185
performance-test:
@@ -200,7 +203,7 @@ race-condition-dev: ## Run agent executable with race condition detection
200203

201204
run-mock-management-grpc-server: ## Run mock management plane gRPC server
202205
@echo "🖲️ Running mock management plane gRPC server"
203-
$(GORUN) test/mock/grpc/cmd/main.go -configDirectory=$(MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY) -logLevel=$(MOCK_MANAGEMENT_PLANE_LOG_LEVEL) -grpcAddress=$(MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS) -apiAddress=$(MOCK_MANAGEMENT_PLANE_API_ADDRESS)
206+
$(GORUN) test/mock/grpc/cmd/main.go -configDirectory=$(MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY) -logLevel=$(MOCK_MANAGEMENT_PLANE_LOG_LEVEL) -grpcAddress=$(MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS) -apiAddress=$(MOCK_MANAGEMENT_PLANE_API_ADDRESS) -externalFileServer=$(MOCK_MANAGEMENT_PLANE_EXTERNAL_FILE_SERVER)
204207

205208

206209
.PHONY: build-test-nginx-plus-and-nap-image

‎Makefile.tools‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ NFPM = github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.36.1
88
GOTESTCOVERAGE = github.com/vladopajic/go-test-coverage/v2@v2.10.1
99
BENCHSTAT = golang.org/x/perf/cmd/benchstat@v0.0.0-20240404204407-f3e401e020e4
1010
BUF = github.com/bufbuild/buf/cmd/buf@v1.30.1
11-
PROMTAIL = github.com/prometheus/promtail/cmd/promtail@v2.10.0
1211

1312
install-tools: ## Install tool dependencies
1413
@echo "Installing Tools"
@@ -23,5 +22,4 @@ install-tools: ## Install tool dependencies
2322
@$(GOINST) $(GOTESTCOVERAGE)
2423
@$(GOINST) $(BENCHSTAT)
2524
@$(GOINST) $(BUF)
26-
@$(GOINST) $(PROMTAIL)
2725
@$(GORUN) $(LEFTHOOK) install

0 commit comments

Comments
 (0)