Skip to content

Commit 04f0d6c

Browse files
authored
Merge pull request #186 from crossplane-contrib/fix/cve-remediation-release-0.6-20260316-223531
fix(security): remediate CVE vulnerabilities
2 parents 1c7c9e1 + 1f51f2d commit 04f0d6c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
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
@@ -50,7 +50,7 @@ jobs:
5050
cache: false # The golangci-lint action does its own caching.
5151

5252
- name: Lint
53-
uses: golangci/golangci-lint-action@v6
53+
uses: golangci/golangci-lint-action@v7
5454
with:
5555
version: ${{ env.GOLANGCI_VERSION }}
5656
args: --timeout=5m

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/function-auto-ready
22

3-
go 1.24.13
3+
go 1.25.8
44

55
require (
66
github.com/alecthomas/kong v1.12.0

healthchecks/cronjob.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ func checkCronJobHealth(obj *unstructured.Unstructured) bool {
4242
// Check if last execution was successful
4343
// If lastSuccessfulTime is after lastScheduleTime, the last execution succeeded
4444
if cronJob.Status.LastSuccessfulTime != nil && cronJob.Status.LastScheduleTime != nil {
45-
if cronJob.Status.LastSuccessfulTime.Time.After(cronJob.Status.LastScheduleTime.Time) ||
46-
cronJob.Status.LastSuccessfulTime.Time.Equal(cronJob.Status.LastScheduleTime.Time) {
45+
if cronJob.Status.LastSuccessfulTime.After(cronJob.Status.LastScheduleTime.Time) ||
46+
cronJob.Status.LastSuccessfulTime.Equal(cronJob.Status.LastScheduleTime) {
4747
return true
4848
}
4949
// Last execution failed

healthchecks/cronjob_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestCheckCronJobHealth(t *testing.T) {
3535
"suspend": false,
3636
},
3737
"status": map[string]interface{}{
38-
"lastScheduleTime": "2024-01-01T10:00:00Z",
38+
"lastScheduleTime": "2024-01-01T10:00:00Z",
3939
"lastSuccessfulTime": "2024-01-01T10:05:00Z",
4040
},
4141
},
@@ -73,7 +73,7 @@ func TestCheckCronJobHealth(t *testing.T) {
7373
"suspend": false,
7474
},
7575
"status": map[string]interface{}{
76-
"lastScheduleTime": "2024-01-01T10:05:00Z",
76+
"lastScheduleTime": "2024-01-01T10:05:00Z",
7777
"lastSuccessfulTime": "2024-01-01T10:00:00Z",
7878
},
7979
},

0 commit comments

Comments
 (0)