Skip to content

Commit 1323c47

Browse files
authored
Merge pull request #553 from crossplane-contrib/fix/cve-remediation-release-0.11-20260316-223551
fix(security): remediate CVE vulnerabilities
2 parents 7a1af48 + dee144f commit 1323c47

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ on:
1414

1515
env:
1616
# Common versions
17-
GO_VERSION: '1.24.13'
18-
GOLANGCI_VERSION: 'v1.64.8'
17+
GO_VERSION: '1.25.8'
18+
GOLANGCI_VERSION: 'v2.11.3'
1919
DOCKER_BUILDX_VERSION: 'v0.23.0'
2020

2121
# These environment variables are important to the Crossplane CLI install.sh
@@ -53,7 +53,7 @@ jobs:
5353
run: go mod tidy && git diff --exit-code go.mod go.sum
5454

5555
- name: Lint
56-
uses: golangci/golangci-lint-action@v6
56+
uses: golangci/golangci-lint-action@v7
5757
with:
5858
version: ${{ env.GOLANGCI_VERSION }}
5959

.golangci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: "2"
2+
3+
run:
4+
timeout: 10m
5+
6+
linters:
7+
default: standard
8+
disable:
9+
- depguard

claimconditions.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ func UpdateClaimConditions(rsp *fnv1.RunFunctionResponse, conditions ...Targeted
4343
// transformCondition converts a TargetedCondition to be compatible with the Protobuf SDK
4444
func transformCondition(tc TargetedCondition) *fnv1.Condition {
4545
c := &fnv1.Condition{
46-
Type: string(tc.Condition.Type),
47-
Reason: string(tc.Condition.Reason),
46+
Type: string(tc.Type),
47+
Reason: string(tc.Reason),
4848
Target: transformTarget(tc.Target),
4949
}
5050

51-
switch tc.Condition.Status {
51+
switch tc.Status {
5252
case corev1.ConditionTrue:
5353
c.Status = fnv1.Status_STATUS_CONDITION_TRUE
5454
case corev1.ConditionFalse:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/crossplane-contrib/function-go-templating
22

3-
go 1.24.13
3+
go 1.25.8
44

55
require (
66
dario.cat/mergo v1.0.2

0 commit comments

Comments
 (0)