Skip to content

Commit 9d88150

Browse files
authored
Bump-dependencies (#678)
* chore: upgraded gitlab.com/gitlab-org/api/client-go v0.121.0 => v0.143.3 * chore: upgraded code.gitea.io/sdk/gitea v0.19.0 => v0.22.0 * chore: upgraded github.com/redis/go-redis/v9 v9.6.1 => v9.14.0 * chore: upgraded github.com/go-jose/go-jose/v4 v4.0.4 => v4.1.2 * chore: upgraded github.com/briandowns/spinner v1.23.1 => v1.23.2 * chore: upgraded github.com/spf13/pflag v1.0.5 => v1.0.10 * chore: upgraded github.com/argoproj/argo-cd/v2 v2.13.4 => github.com/argoproj/argo-cd/v3 v3.1.5 * update to golang 1.25.1 * chore: updated golangci-lint to 2.4.0 --------- Signed-off-by: Noam Gal <[email protected]>
1 parent 66f6387 commit 9d88150

23 files changed

+876
-780
lines changed

.golangci.yaml

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
1-
# This file contains all available configuration options
2-
# with their default values.
3-
4-
# options for analysis running
1+
version: "2"
52
run:
6-
# default concurrency is a available CPU number
73
concurrency: 4
8-
9-
# timeout for analysis, e.g. 30s, 5m, default is 1m
10-
timeout: 5m
11-
12-
# exit code when at least one issue was found, default is 1
134
issues-exit-code: 1
14-
155
linters:
166
enable:
177
- gocyclo
18-
- errcheck
198
- godox
20-
# all available settings of specific linters
21-
linters-settings:
22-
errcheck:
23-
# report about not checking of errors in type assertions: `a := b.(MyStruct)`;
24-
# default is false: such cases aren't reported by default.
25-
check-type-assertions: false
26-
27-
# report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
28-
# default is false: such cases aren't reported by default.
29-
check-blank: false
30-
31-
gocyclo:
32-
# minimal code complexity to report, 30 by default (but we recommend 10-20)
33-
min-complexity: 18
9+
settings:
10+
errcheck:
11+
check-type-assertions: false
12+
check-blank: false
13+
gocyclo:
14+
min-complexity: 18
15+
exclusions:
16+
generated: lax
17+
presets:
18+
- comments
19+
- common-false-positives
20+
- legacy
21+
- std-error-handling
22+
paths:
23+
- third_party$
24+
- builtin$
25+
- examples$
26+
formatters:
27+
exclusions:
28+
generated: lax
29+
paths:
30+
- third_party$
31+
- builtin$
32+
- examples$

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ USER 999
2525
WORKDIR /home/autopilot
2626

2727
### Build
28-
FROM docker.io/library/golang:1.24 AS build
28+
FROM docker.io/library/golang:1.25 AS build
2929

3030
WORKDIR /go/src/github.com/argoproj-labs/argocd-autopilot
3131

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,12 @@ MOCKGEN = ${LOCALBIN}/mockgen
170170

171171
## Tool Versions
172172
MOCKGEN_VERSION ?= v1.6.0
173-
GOLANGCI_LINT_VERSION ?= v1.64.7
173+
GOLANGCI_LINT_VERSION ?= v2.4.0
174174

175175
.PHONY: golangci-lint
176176
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
177177
$(GOLANGCI_LINT):
178-
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
178+
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
179179

180180
.PHONY: mockgen
181181
mockgen: $(MOCKGEN) ## Download mockgen locally if necessary.

build/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ steps:
1919
prepare_env_vars: &deps
2020
stage: Prepare
2121
title: prepare-env
22-
image: quay.io/codefresh/golang-ci-helper:1.24.1
22+
image: quay.io/codefresh/golang-ci-helper:1.25
2323
commands:
2424
- cf_export GO111MODULE=on
2525
- cf_export GOCACHE=/codefresh/volume/gocache # change gopath to codefresh shared volume

build/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
check_version: &deps
2121
stage: Prepare
2222
title: check version
23-
image: quay.io/codefresh/golang-ci-helper:1.24.1
23+
image: quay.io/codefresh/golang-ci-helper:1.25
2424
commands:
2525
- cf_export GO111MODULE=on
2626
- cf_export GOCACHE=/codefresh/volume/gocache # change gopath to codefresh shared volume

build/sanity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
prep: &deps
1919
stage: "prepare"
2020
title: "prepare env vars"
21-
image: quay.io/codefresh/golang-ci-helper:1.24.1
21+
image: quay.io/codefresh/golang-ci-helper:1.25
2222
commands:
2323
- cf_export GO111MODULE=on
2424
- cf_export NAMESPACE=${{KUBE_NAMESPACE}}-$(date "+%M-%S")

cmd/commands/app.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
1818
"github.com/argoproj-labs/argocd-autopilot/pkg/util"
1919

20-
argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
20+
argocdv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
2121
"github.com/go-git/go-billy/v5/memfs"
2222
"github.com/go-git/go-billy/v5/osfs"
2323
billyUtils "github.com/go-git/go-billy/v5/util"
@@ -264,7 +264,7 @@ var setAppOptsDefaults = func(ctx context.Context, repofs fs.FS, opts *AppCreate
264264
if opts.AppOpts.Labels == nil {
265265
opts.AppOpts.Labels = opts.Labels
266266
}
267-
267+
268268
if opts.AppOpts.Annotations == nil {
269269
opts.AppOpts.Annotations = opts.Annotations
270270
}
@@ -282,10 +282,10 @@ var setAppOptsDefaults = func(ctx context.Context, repofs fs.FS, opts *AppCreate
282282
url := host + orgRepo + suffix
283283
log.G(ctx).Infof("cloning repo: '%s', to infer app type from path '%s'", url, p)
284284
cloneOpts := &git.CloneOptions{
285-
Repo: opts.AppOpts.AppSpecifier,
286-
Auth: opts.CloneOpts.Auth,
285+
Repo: opts.AppOpts.AppSpecifier,
286+
Auth: opts.CloneOpts.Auth,
287287
Provider: opts.CloneOpts.Provider,
288-
FS: fs.Create(memfs.New()),
288+
FS: fs.Create(memfs.New()),
289289
}
290290
cloneOpts.Parse()
291291
_, fsys, err = getRepo(ctx, cloneOpts)

cmd/commands/app_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
kubemocks "github.com/argoproj-labs/argocd-autopilot/pkg/kube/mocks"
1919
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
2020

21-
argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
21+
argocdv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
2222
"github.com/go-git/go-billy/v5/memfs"
2323
billyUtils "github.com/go-git/go-billy/v5/util"
2424
"github.com/golang/mock/gomock"

cmd/commands/common.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
1717
"github.com/argoproj-labs/argocd-autopilot/pkg/util"
1818

19-
argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
19+
argocdv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
"sigs.k8s.io/yaml"
2222
)
@@ -139,11 +139,11 @@ func createApp(opts *createAppOptions) ([]byte, error) {
139139
},
140140
}
141141
if opts.noFinalizer {
142-
app.ObjectMeta.Finalizers = []string{}
142+
app.Finalizers = []string{}
143143
}
144144
if len(opts.labels) > 0 {
145145
for k, v := range opts.labels {
146-
app.ObjectMeta.Labels[k] = v
146+
app.Labels[k] = v
147147
}
148148
}
149149

cmd/commands/project.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
2020
"github.com/argoproj-labs/argocd-autopilot/pkg/util"
2121

22-
argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
22+
argocdv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
2323
"github.com/go-git/go-billy/v5/memfs"
2424
billyUtils "github.com/go-git/go-billy/v5/util"
2525
"github.com/spf13/cobra"

0 commit comments

Comments
 (0)