Skip to content

Commit 4f0141a

Browse files
ishitasequeiraishitasequeira
authored
Update references of pkg/tag pkg/log pkg/options to use modules from registry-scanner (#962)
Signed-off-by: Ishita Sequeira <[email protected]>
1 parent f55eeef commit 4f0141a

40 files changed

+51
-999
lines changed

‎cmd/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"github.com/argoproj-labs/argocd-image-updater/pkg/common"
1515
"github.com/argoproj-labs/argocd-image-updater/pkg/env"
1616
"github.com/argoproj-labs/argocd-image-updater/pkg/health"
17-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
1817
"github.com/argoproj-labs/argocd-image-updater/pkg/metrics"
1918
"github.com/argoproj-labs/argocd-image-updater/pkg/registry"
2019
"github.com/argoproj-labs/argocd-image-updater/pkg/version"
20+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
2121

2222
"github.com/argoproj/argo-cd/v2/reposerver/askpass"
2323

‎cmd/template.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/argoproj-labs/argocd-image-updater/pkg/argocd"
1010
"github.com/argoproj-labs/argocd-image-updater/pkg/common"
1111
"github.com/argoproj-labs/argocd-image-updater/pkg/image"
12-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
12+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
1313

1414
"github.com/spf13/cobra"
1515
)

‎cmd/test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
"github.com/argoproj-labs/argocd-image-updater/pkg/image"
99
"github.com/argoproj-labs/argocd-image-updater/pkg/kube"
10-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
11-
"github.com/argoproj-labs/argocd-image-updater/pkg/options"
1210
"github.com/argoproj-labs/argocd-image-updater/pkg/registry"
11+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
12+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/options"
1313

1414
"github.com/spf13/cobra"
1515
"github.com/spf13/pflag"

‎cmd/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88

99
"github.com/argoproj-labs/argocd-image-updater/pkg/kube"
10-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
10+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
1111
)
1212

1313
func getPrintableInterval(interval time.Duration) string {

‎ext/git/writer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strconv"
77
"strings"
88

9-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
9+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
1010
)
1111

1212
// CommitOptions holds options for a git commit operation

‎go.mod

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ toolchain go1.23.0
66

77
require (
88
github.com/Masterminds/semver/v3 v3.3.1
9+
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20241213191436-f55eeef5df63
910
github.com/argoproj/argo-cd/v2 v2.13.1
1011
github.com/argoproj/gitops-engine v0.7.1-0.20240905010810-bd7681ae3f8b
1112
github.com/argoproj/pkg v0.13.7-0.20230627120311-a4dd357b057e
@@ -36,11 +37,6 @@ require (
3637
sigs.k8s.io/kustomize/kyaml v0.17.1
3738
)
3839

39-
require (
40-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
41-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
42-
)
43-
4440
require (
4541
cloud.google.com/go/compute/metadata v0.5.0 // indirect
4642
dario.cat/mergo v1.0.1 // indirect
@@ -152,6 +148,8 @@ require (
152148
golang.org/x/time v0.6.0 // indirect
153149
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
154150
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
151+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
152+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
155153
google.golang.org/protobuf v1.34.2 // indirect
156154
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
157155
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -175,7 +173,8 @@ require (
175173
)
176174

177175
replace (
178-
github.com/argoproj-labs/argocd-image-updater/registry-scanner => ../registry-scanner
176+
// Uncomment for local testing
177+
// github.com/argoproj-labs/argocd-image-updater/registry-scanner => ./registry-scanner/
179178
github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
180179
github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
181180

‎go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ github.com/alicebob/miniredis/v2 v2.33.0/go.mod h1:MhP4a3EU7aENRi9aO+tHfTBZicLqQ
2727
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
2828
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
2929
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
30+
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20241213191436-f55eeef5df63 h1:XG/3UqAQmNqTCyinX8dGF/exFIkV5RqyXJgcVPHVGRg=
31+
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20241213191436-f55eeef5df63/go.mod h1:GJD+hNHt9KbYFo1+OddD3vvqys7ct5ZIOx5yHFCBAXg=
3032
github.com/argoproj/argo-cd/v2 v2.13.1 h1:qoa8LD5suPCAYtoDNHp+BuqODf46hl5gCuXNj2oiAy0=
3133
github.com/argoproj/argo-cd/v2 v2.13.1/go.mod h1:RC23V2744nhZstZVpLCWTQLT2gR0+IXGC3GTBCI6M+I=
3234
github.com/argoproj/gitops-engine v0.7.1-0.20240905010810-bd7681ae3f8b h1:wOPWJ5MBScQO767WpU55oUJDXObfvPL0EfAYWxogbSw=

‎pkg/argocd/argocd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/argoproj-labs/argocd-image-updater/pkg/env"
1313
"github.com/argoproj-labs/argocd-image-updater/pkg/image"
1414
"github.com/argoproj-labs/argocd-image-updater/pkg/kube"
15-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
1615
"github.com/argoproj-labs/argocd-image-updater/pkg/metrics"
16+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
1717

1818
argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
1919
"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"

‎pkg/argocd/git.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/argoproj-labs/argocd-image-updater/pkg/image"
1919

2020
"github.com/argoproj-labs/argocd-image-updater/ext/git"
21-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
21+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
2222

2323
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
2424
)

‎pkg/argocd/git_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/argoproj-labs/argocd-image-updater/pkg/common"
1010
"github.com/argoproj-labs/argocd-image-updater/pkg/image"
11-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
11+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
1212

1313
"sigs.k8s.io/kustomize/api/types"
1414
kyaml "sigs.k8s.io/kustomize/kyaml/yaml"

‎pkg/argocd/gitcreds.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
"github.com/argoproj-labs/argocd-image-updater/ext/git"
1616
"github.com/argoproj-labs/argocd-image-updater/pkg/kube"
17-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
17+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
1818
)
1919

2020
// getGitCredsSource returns git credentials source that loads credentials from the secret or from Argo CD settings

‎pkg/argocd/update.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"github.com/argoproj-labs/argocd-image-updater/pkg/common"
1616
"github.com/argoproj-labs/argocd-image-updater/pkg/image"
1717
"github.com/argoproj-labs/argocd-image-updater/pkg/kube"
18-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
1918
"github.com/argoproj-labs/argocd-image-updater/pkg/registry"
20-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
19+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
20+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
2121

2222
"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
2323
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"

‎pkg/argocd/update_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/argoproj-labs/argocd-image-updater/pkg/kube"
2020
"github.com/argoproj-labs/argocd-image-updater/pkg/registry"
2121
regmock "github.com/argoproj-labs/argocd-image-updater/pkg/registry/mocks"
22-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
22+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
2323
"github.com/argoproj-labs/argocd-image-updater/test/fake"
2424
"github.com/argoproj-labs/argocd-image-updater/test/fixture"
2525

‎pkg/cache/cache.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cache
22

33
import (
4-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
4+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
55
)
66

77
type ImageTagCache interface {

‎pkg/cache/memcache.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cache
33
import (
44
"fmt"
55

6-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
6+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
77

88
memcache "github.com/patrickmn/go-cache"
99
)

‎pkg/cache/memcache_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/require"
1010

11-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
11+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
1212
)
1313

1414
func Test_MemCache(t *testing.T) {

‎pkg/env/env.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strconv"
77
"strings"
88

9-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
9+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
1010
)
1111

1212
// Package env provides some utility functions to interact with the environment

‎pkg/health/health.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"net/http"
88

9-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
9+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
1010
)
1111

1212
func StartHealthServer(port int) chan error {

‎pkg/image/credentials.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
argoexec "github.com/argoproj/pkg/exec"
1313

1414
"github.com/argoproj-labs/argocd-image-updater/pkg/kube"
15-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
15+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
1616
)
1717

1818
type CredentialSourceType int

‎pkg/image/image.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"github.com/distribution/distribution/v3/reference"
88

9-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
10-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
9+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
10+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
1111
)
1212

1313
type ContainerImage struct {

‎pkg/image/image_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/stretchr/testify/require"
99
"golang.org/x/exp/slices"
1010

11-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
11+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
1212
)
1313

1414
func Test_ParseImageTags(t *testing.T) {

‎pkg/image/matchfunc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package image
33
import (
44
"regexp"
55

6-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
6+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
77
)
88

99
// MatchFuncAny matches any pattern, i.e. always returns true

‎pkg/image/options.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88

99
"github.com/argoproj-labs/argocd-image-updater/pkg/common"
10-
"github.com/argoproj-labs/argocd-image-updater/pkg/options"
10+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/options"
1111
)
1212

1313
// GetParameterHelmImageName gets the value for image-name option for the image

‎pkg/image/options_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/stretchr/testify/require"
1212

1313
"github.com/argoproj-labs/argocd-image-updater/pkg/common"
14-
"github.com/argoproj-labs/argocd-image-updater/pkg/options"
14+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/options"
1515
)
1616

1717
func Test_GetHelmOptions(t *testing.T) {

‎pkg/image/version.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package image
33
import (
44
"path/filepath"
55

6-
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
7-
"github.com/argoproj-labs/argocd-image-updater/pkg/options"
8-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
6+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
7+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/options"
8+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
99

1010
"github.com/Masterminds/semver/v3"
1111
)

‎pkg/image/version_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"github.com/stretchr/testify/assert"
88
"github.com/stretchr/testify/require"
99

10-
"github.com/argoproj-labs/argocd-image-updater/pkg/options"
11-
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
10+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/options"
11+
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag"
1212
)
1313

1414
func newImageTagList(tagNames []string) *tag.ImageTagList {

0 commit comments

Comments
 (0)