Skip to content

Commit 23ff574

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/upload-pages-artifact-4
2 parents 8de5186 + 33f61ac commit 23ff574

File tree

26 files changed

+276
-113
lines changed

26 files changed

+276
-113
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
modules: ${{ steps.detect-changes.outputs.modules }}
3434
steps:
3535
- name: Checkout
36-
uses: actions/checkout@v5.0.0 # [email protected]
36+
uses: actions/checkout@v5 # [email protected]
3737
with:
3838
fetch-depth: 0
3939
- name: Detect Changes
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
# Copyright 2025 Deutsche Telekom IT GmbH
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
name: Dependabot Tidy
6+
7+
on:
8+
pull_request:
9+
paths:
10+
- '**/go.mod'
11+
- '**/go.sum'
12+
workflow_dispatch:
13+
14+
jobs:
15+
tidy:
16+
name: Run go mod tidy
17+
if: github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch'
18+
runs-on: ubuntu-latest
19+
permissions:
20+
contents: write
21+
pull-requests: write
22+
23+
steps:
24+
- uses: actions/checkout@v5
25+
with:
26+
ref: ${{ github.head_ref }}
27+
fetch-depth: 0
28+
29+
- name: Set up Go
30+
uses: actions/setup-go@v5
31+
with:
32+
go-version: 'stable'
33+
check-latest: true
34+
35+
- name: Run go mod tidy on all modules
36+
run: |
37+
echo "Identified modules:"
38+
MODULES=$(find . -name 'go.mod' -exec dirname {} \; | sort)
39+
echo "$MODULES"
40+
echo "\nRunning go mod tidy on all modules..."
41+
echo "$MODULES" | while read -r module_dir; do
42+
if [ -n "$module_dir" ]; then
43+
echo "Processing: $module_dir"
44+
(cd "$module_dir" && go mod tidy)
45+
fi
46+
done
47+
48+
- name: Check for changes
49+
id: check_changes
50+
run: |
51+
if [[ -n "$(git status --porcelain)" ]]; then
52+
echo "changes=true" >> $GITHUB_OUTPUT
53+
echo "Changes detected after running go mod tidy:"
54+
git diff --name-only
55+
else
56+
echo "changes=false" >> $GITHUB_OUTPUT
57+
echo "No changes detected after running go mod tidy"
58+
fi
59+
60+
- name: Commit and push changes
61+
if: steps.check_changes.outputs.changes == 'true'
62+
run: |
63+
git config user.name "github-actions[bot]"
64+
git config user.email "github-actions[bot]@users.noreply.github.com"
65+
git add .
66+
git commit -m "chore: run go mod tidy for modules updated by dependabot"
67+
git push
68+
69+
- name: Add comment to PR
70+
if: steps.check_changes.outputs.changes == 'true'
71+
uses: actions/github-script@v7
72+
with:
73+
github-token: ${{ secrets.GITHUB_TOKEN }}
74+
script: |
75+
github.rest.issues.createComment({
76+
issue_number: context.issue.number,
77+
owner: context.repo.owner,
78+
repo: context.repo.repo,
79+
body: '✅ `go mod tidy` has been run for all Go modules and changes have been committed to this PR.'
80+
})

.github/workflows/docs-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Build Docusaurus
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
with:
1919
fetch-depth: 0
2020
- uses: actions/setup-node@v4

.github/workflows/docs-deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Build Docusaurus
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
fetch-depth: 0
2222
- uses: actions/setup-node@v4

.github/workflows/helm-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v5.0.0
28+
uses: actions/checkout@v5
2929
with:
3030
fetch-depth: 0
3131

.github/workflows/ort.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Use HTTPS for Git cloning
2121
run: git config --global url.https://github.com/.insteadOf ssh://[email protected]/
2222
- name: Checkout project
23-
uses: actions/checkout@v5.0.0
23+
uses: actions/checkout@v5
2424
- name: Prepare ORT config
2525
# This allows us to customize the default ORT config available at
2626
# https://github.com/oss-review-toolkit/ort-config

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
app_id: ${{ secrets.BOT_APP_ID }}
2525
private_key: ${{ secrets.BOT_PRIVATE_KEY }}
2626
- name: Checkout
27-
uses: actions/checkout@v5.0.0
27+
uses: actions/checkout@v5
2828
with:
2929
fetch-depth: 0
3030
token: ${{ steps.generate_token.outputs.token }}

.github/workflows/reusable-go-ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ jobs:
262262
${{ runner.os }}-go-${{ inputs.module }}-
263263
264264
- name: Initialize CodeQL
265-
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # pinv3.29.11
265+
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # pinv3.30.3
266266
with:
267267
languages: go
268268
build-mode: manual # Set to manual as we provide a build step
@@ -283,7 +283,7 @@ jobs:
283283
fi
284284
285285
- name: Perform CodeQL Analysis
286-
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # pinv3.29.11
286+
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # pinv3.30.3
287287
with:
288288
category: "/language:go"
289289

@@ -359,7 +359,7 @@ jobs:
359359
steps:
360360
# No checkout or Go setup needed if only running Trivy on a remote image
361361
- name: Run Trivy vulnerability scanner
362-
uses: aquasecurity/[email protected].0
362+
uses: aquasecurity/[email protected].1
363363
with:
364364
image-ref: ${{ inputs.container_registry }}/${{ inputs.github_repository }}/${{ inputs.module }}@${{ needs.build.outputs.image_digest }}
365365
exit-code: "1"

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [0.12.1](https://github.com/telekom/controlplane/compare/v0.12.0...v0.12.1) (2025-09-08)
2+
3+
4+
### Bug Fixes
5+
6+
* **rover-ctl:** correctly map security object for oauth2 and basicauth ([#158](https://github.com/telekom/controlplane/issues/158)) ([68b4dee](https://github.com/telekom/controlplane/commit/68b4dee5e62aba889bd5f80013b0e4bea060a725))
7+
18
# [0.12.0](https://github.com/telekom/controlplane/compare/v0.11.0...v0.12.0) (2025-09-05)
29

310

admin/api/v1/zone_types.go

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,20 @@ type ZoneSpec struct {
7777
}
7878

7979
type Links struct {
80-
GatewayUrl string `json:"gatewayUrl"`
81-
GatewayIssuer string `json:"gatewayIssuer"`
82-
StargateLmsIssuer string `json:"stargateLmsIssuer"`
80+
// Url is the base URL of the default gateway of this zone
81+
// +kubebuilder:validation:Format=uri
82+
Url string `json:"gatewayUrl"`
83+
// Issuer is the expected issuer of downstream tokens for this zone
84+
// +kubebuilder:validation:Format=uri
85+
Issuer string `json:"gatewayIssuer"`
86+
// TeamIssuer is the expected issuer of downstream tokens for Team APIs in this zone
87+
// +kubebuilder:validation:Format=uri
88+
// +optional
89+
TeamIssuer string `json:"teamApiIssuer,omitempty"`
90+
// LmsIssuer is the issuer of the Last-Mile-Security tokens (upstream) for this zone
91+
// +kubebuilder:validation:Format=uri
92+
// +optional
93+
LmsIssuer string `json:"gatewayLmsIssuer"`
8394
}
8495

8596
// ZoneStatus defines the observed state of Zone

0 commit comments

Comments
 (0)