Skip to content

Commit bb5f2db

Browse files
matheuscscpmatheuscscp
committed
Upgrade fluxcd/pkg auth, oci, git and git/gogit
Signed-off-by: Matheus Pimenta <[email protected]>
1 parent 0a64800 commit bb5f2db

File tree

9 files changed

+47
-96
lines changed

9 files changed

+47
-96
lines changed

‎cmd/flux/build_artifact.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
"github.com/spf13/cobra"
2828

29-
oci "github.com/fluxcd/pkg/oci/client"
29+
"github.com/fluxcd/pkg/oci"
3030
"github.com/fluxcd/pkg/sourceignore"
3131
)
3232

‎cmd/flux/diff_artifact.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"os"
2323

24-
oci "github.com/fluxcd/pkg/oci/client"
24+
"github.com/fluxcd/pkg/oci"
2525
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
2626
"github.com/google/go-containerregistry/pkg/crane"
2727
"github.com/spf13/cobra"
@@ -102,12 +102,7 @@ func diffArtifactCmdRun(cmd *cobra.Command, args []string) error {
102102

103103
if diffArtifactArgs.provider.String() != sourcev1.GenericOCIProvider {
104104
logger.Actionf("logging in to registry with provider credentials")
105-
ociProvider, err := diffArtifactArgs.provider.ToOCIProvider()
106-
if err != nil {
107-
return fmt.Errorf("provider not supported: %w", err)
108-
}
109-
110-
if err := ociClient.LoginWithProvider(ctx, url, ociProvider); err != nil {
105+
if err := ociClient.LoginWithProvider(ctx, url, diffArtifactArgs.provider.String()); err != nil {
111106
return fmt.Errorf("error during login with provider: %w", err)
112107
}
113108
}

‎cmd/flux/list_artifact.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/google/go-containerregistry/pkg/crane"
2424
"github.com/spf13/cobra"
2525

26-
oci "github.com/fluxcd/pkg/oci/client"
26+
"github.com/fluxcd/pkg/oci"
2727
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
2828

2929
"github.com/fluxcd/flux2/v2/internal/flags"
@@ -98,12 +98,7 @@ func listArtifactsCmdRun(cmd *cobra.Command, args []string) error {
9898

9999
if listArtifactArgs.provider.String() != sourcev1.GenericOCIProvider {
100100
logger.Actionf("logging in to registry with provider credentials")
101-
ociProvider, err := listArtifactArgs.provider.ToOCIProvider()
102-
if err != nil {
103-
return fmt.Errorf("provider not supported: %w", err)
104-
}
105-
106-
if err := ociClient.LoginWithProvider(ctx, url, ociProvider); err != nil {
101+
if err := ociClient.LoginWithProvider(ctx, url, listArtifactArgs.provider.String()); err != nil {
107102
return fmt.Errorf("error during login with provider: %w", err)
108103
}
109104
}

‎cmd/flux/pull_artifact.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
"github.com/fluxcd/flux2/v2/internal/flags"
2929

30-
oci "github.com/fluxcd/pkg/oci/client"
30+
"github.com/fluxcd/pkg/oci"
3131
)
3232

3333
var pullArtifactCmd = &cobra.Command{
@@ -103,12 +103,7 @@ func pullArtifactCmdRun(cmd *cobra.Command, args []string) error {
103103

104104
if pullArtifactArgs.provider.String() != sourcev1.GenericOCIProvider {
105105
logger.Actionf("logging in to registry with provider credentials")
106-
ociProvider, err := pullArtifactArgs.provider.ToOCIProvider()
107-
if err != nil {
108-
return fmt.Errorf("provider not supported: %w", err)
109-
}
110-
111-
if err := ociClient.LoginWithProvider(ctx, url, ociProvider); err != nil {
106+
if err := ociClient.LoginWithProvider(ctx, url, pullArtifactArgs.provider.String()); err != nil {
112107
return fmt.Errorf("error during login with provider: %w", err)
113108
}
114109
}

‎cmd/flux/push_artifact.go

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ import (
3333
"github.com/spf13/cobra"
3434
"sigs.k8s.io/yaml"
3535

36+
authutils "github.com/fluxcd/pkg/auth/utils"
3637
"github.com/fluxcd/pkg/oci"
37-
"github.com/fluxcd/pkg/oci/auth/login"
38-
"github.com/fluxcd/pkg/oci/client"
3938
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
4039

4140
"github.com/fluxcd/flux2/v2/internal/flags"
@@ -161,7 +160,7 @@ func pushArtifactCmdRun(cmd *cobra.Command, args []string) error {
161160
return fmt.Errorf("invalid path %q", pushArtifactArgs.path)
162161
}
163162

164-
url, err := client.ParseArtifactURL(ociURL)
163+
url, err := oci.ParseArtifactURL(ociURL)
165164
if err != nil {
166165
return err
167166
}
@@ -200,7 +199,7 @@ func pushArtifactCmdRun(cmd *cobra.Command, args []string) error {
200199
logs.Warn.SetOutput(os.Stderr)
201200
}
202201

203-
meta := client.Metadata{
202+
meta := oci.Metadata{
204203
Source: pushArtifactArgs.source,
205204
Revision: pushArtifactArgs.revision,
206205
Annotations: annotations,
@@ -214,29 +213,24 @@ func pushArtifactCmdRun(cmd *cobra.Command, args []string) error {
214213
ctx, cancel := context.WithTimeout(context.Background(), rootArgs.timeout)
215214
defer cancel()
216215

217-
var auth authn.Authenticator
218-
opts := client.DefaultOptions()
216+
var authenticator authn.Authenticator
217+
opts := oci.DefaultOptions()
219218
if pushArtifactArgs.provider.String() == sourcev1.GenericOCIProvider && pushArtifactArgs.creds != "" {
220219
logger.Actionf("logging in to registry with credentials")
221-
auth, err = client.GetAuthFromCredentials(pushArtifactArgs.creds)
220+
authenticator, err = oci.GetAuthFromCredentials(pushArtifactArgs.creds)
222221
if err != nil {
223222
return fmt.Errorf("could not login with credentials: %w", err)
224223
}
225-
opts = append(opts, crane.WithAuth(auth))
224+
opts = append(opts, crane.WithAuth(authenticator))
226225
}
227226

228227
if pushArtifactArgs.provider.String() != sourcev1.GenericOCIProvider {
229228
logger.Actionf("logging in to registry with provider credentials")
230-
ociProvider, err := pushArtifactArgs.provider.ToOCIProvider()
231-
if err != nil {
232-
return fmt.Errorf("provider not supported: %w", err)
233-
}
234-
235-
auth, err = login.NewManager().Login(ctx, url, ref, getProviderLoginOption(ociProvider))
229+
authenticator, err = authutils.GetArtifactRegistryCredentials(ctx, pushArtifactArgs.provider.String(), url)
236230
if err != nil {
237231
return fmt.Errorf("error during login with provider: %w", err)
238232
}
239-
opts = append(opts, crane.WithAuth(auth))
233+
opts = append(opts, crane.WithAuth(authenticator))
240234
}
241235

242236
if rootArgs.timeout != 0 {
@@ -251,17 +245,17 @@ func pushArtifactCmdRun(cmd *cobra.Command, args []string) error {
251245
Cap: rootArgs.timeout,
252246
}
253247

254-
if auth == nil {
255-
auth, err = authn.DefaultKeychain.Resolve(ref.Context())
248+
if authenticator == nil {
249+
authenticator, err = authn.DefaultKeychain.Resolve(ref.Context())
256250
if err != nil {
257251
return err
258252
}
259253
}
260-
transportOpts, err := client.WithRetryTransport(ctx, ref, auth, backoff, []string{ref.Context().Scope(transport.PushScope)})
254+
transportOpts, err := oci.WithRetryTransport(ctx, ref, authenticator, backoff, []string{ref.Context().Scope(transport.PushScope)})
261255
if err != nil {
262256
return fmt.Errorf("error setting up transport: %w", err)
263257
}
264-
opts = append(opts, transportOpts, client.WithRetryBackOff(backoff))
258+
opts = append(opts, transportOpts, oci.WithRetryBackOff(backoff))
265259
}
266260

267261
if pushArtifactArgs.output == "" {
@@ -272,10 +266,10 @@ func pushArtifactCmdRun(cmd *cobra.Command, args []string) error {
272266
opts = append(opts, crane.Insecure)
273267
}
274268

275-
ociClient := client.NewClient(opts)
269+
ociClient := oci.NewClient(opts)
276270
digestURL, err := ociClient.Push(ctx, url, path,
277-
client.WithPushMetadata(meta),
278-
client.WithPushIgnorePaths(pushArtifactArgs.ignorePaths...),
271+
oci.WithPushMetadata(meta),
272+
oci.WithPushIgnorePaths(pushArtifactArgs.ignorePaths...),
279273
)
280274
if err != nil {
281275
return fmt.Errorf("pushing artifact failed: %w", err)
@@ -323,16 +317,3 @@ func pushArtifactCmdRun(cmd *cobra.Command, args []string) error {
323317

324318
return nil
325319
}
326-
327-
func getProviderLoginOption(provider oci.Provider) login.ProviderOptions {
328-
var opts login.ProviderOptions
329-
switch provider {
330-
case oci.ProviderAzure:
331-
opts.AzureAutoLogin = true
332-
case oci.ProviderAWS:
333-
opts.AwsAutoLogin = true
334-
case oci.ProviderGCP:
335-
opts.GcpAutoLogin = true
336-
}
337-
return opts
338-
}

‎cmd/flux/tag_artifact.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/spf13/cobra"
2424

25-
oci "github.com/fluxcd/pkg/oci/client"
25+
"github.com/fluxcd/pkg/oci"
2626
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
2727

2828
"github.com/fluxcd/flux2/v2/internal/flags"
@@ -89,12 +89,7 @@ func tagArtifactCmdRun(cmd *cobra.Command, args []string) error {
8989

9090
if tagArtifactArgs.provider.String() != sourcev1.GenericOCIProvider {
9191
logger.Actionf("logging in to registry with provider credentials")
92-
ociProvider, err := tagArtifactArgs.provider.ToOCIProvider()
93-
if err != nil {
94-
return fmt.Errorf("provider not supported: %w", err)
95-
}
96-
97-
if err := ociClient.LoginWithProvider(ctx, url, ociProvider); err != nil {
92+
if err := ociClient.LoginWithProvider(ctx, url, tagArtifactArgs.provider.String()); err != nil {
9893
return fmt.Errorf("error during login with provider: %w", err)
9994
}
10095
}

‎go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ require (
1919
github.com/fluxcd/notification-controller/api v1.5.0
2020
github.com/fluxcd/pkg/apis/event v0.17.0
2121
github.com/fluxcd/pkg/apis/meta v1.11.0
22+
github.com/fluxcd/pkg/auth v0.11.1-0.20250504212336-3c3c3cab892e
2223
github.com/fluxcd/pkg/chartutil v1.3.0
2324
github.com/fluxcd/pkg/envsubst v1.4.0
24-
github.com/fluxcd/pkg/git v0.27.0
25-
github.com/fluxcd/pkg/git/gogit v0.27.0
25+
github.com/fluxcd/pkg/git v0.28.0
26+
github.com/fluxcd/pkg/git/gogit v0.30.0
2627
github.com/fluxcd/pkg/kustomize v1.17.0
27-
github.com/fluxcd/pkg/oci v0.46.0
28+
github.com/fluxcd/pkg/oci v0.47.1-0.20250504222034-ce6987524d7a
2829
github.com/fluxcd/pkg/runtime v0.59.0
2930
github.com/fluxcd/pkg/sourceignore v0.12.0
3031
github.com/fluxcd/pkg/ssa v0.46.0
@@ -65,6 +66,7 @@ require (
6566
)
6667

6768
require (
69+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
6870
code.gitea.io/sdk/gitea v0.21.0 // indirect
6971
dario.cat/mergo v1.0.1 // indirect
7072
github.com/42wim/httpsig v1.2.2 // indirect
@@ -120,8 +122,7 @@ require (
120122
github.com/felixge/httpsnoop v1.0.4 // indirect
121123
github.com/fluxcd/pkg/apis/acl v0.7.0 // indirect
122124
github.com/fluxcd/pkg/apis/kustomize v1.10.0 // indirect
123-
github.com/fluxcd/pkg/auth v0.10.0 // indirect
124-
github.com/fluxcd/pkg/cache v0.8.0 // indirect
125+
github.com/fluxcd/pkg/cache v0.9.0 // indirect
125126
github.com/fsnotify/fsnotify v1.9.0 // indirect
126127
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
127128
github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect

‎go.sum

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
2+
cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
13
code.gitea.io/sdk/gitea v0.21.0 h1:69n6oz6kEVHRo1+APQQyizkhrZrLsTLXey9142pfkD4=
24
code.gitea.io/sdk/gitea v0.21.0/go.mod h1:tnBjVhuKJCn8ibdyyhvUyxrR1Ca2KHEoTWoukNhXQPA=
35
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
@@ -105,6 +107,8 @@ github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ
105107
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
106108
github.com/containerd/stargz-snapshotter/estargz v0.16.3 h1:7evrXtoh1mSbGj/pfRccTampEyKpjpOnS3CyiV1Ebr8=
107109
github.com/containerd/stargz-snapshotter/estargz v0.16.3/go.mod h1:uyr4BfYfOj3G9WBVE8cOlQmXAbPN9VEQpBBeJIuOipU=
110+
github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk=
111+
github.com/coreos/go-oidc/v3 v3.14.1/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
108112
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
109113
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
110114
github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
@@ -175,24 +179,24 @@ github.com/fluxcd/pkg/apis/kustomize v1.10.0 h1:47EeSzkQvlQZdH92vHMe2lK2iR8aOSEJ
175179
github.com/fluxcd/pkg/apis/kustomize v1.10.0/go.mod h1:UsqMV4sqNa1Yg0pmTsdkHRJr7bafBOENIJoAN+3ezaQ=
176180
github.com/fluxcd/pkg/apis/meta v1.11.0 h1:h8q95k6ZEK1HCfsLkt8Np3i6ktb6ZzcWJ6hg++oc9w0=
177181
github.com/fluxcd/pkg/apis/meta v1.11.0/go.mod h1:+son1Va60x2eiDcTwd7lcctbI6C+K3gM7R+ULmEq1SI=
178-
github.com/fluxcd/pkg/auth v0.10.0 h1:acvokI08SVwZwYMMtlUqglZCPPSJKMvvFZ/3zRwWsLI=
179-
github.com/fluxcd/pkg/auth v0.10.0/go.mod h1:Fpzdo9QOpmWRs60s/frxy1sFb+XGN2WNDIty5aJjnbY=
180-
github.com/fluxcd/pkg/cache v0.8.0 h1:juNNGmJ2qKK16oLgX3mFA20kyo+LcfPwIBjt9KGG+S4=
181-
github.com/fluxcd/pkg/cache v0.8.0/go.mod h1:jMwabjWfsC5lW8hE7NM3wtGNwSJ38Javx6EKbEi7INU=
182+
github.com/fluxcd/pkg/auth v0.11.1-0.20250504212336-3c3c3cab892e h1:bYYHjibVjIJLKtTfYAijvfq1TZM50ZA16XuSfEurbrc=
183+
github.com/fluxcd/pkg/auth v0.11.1-0.20250504212336-3c3c3cab892e/go.mod h1:gQD2VT5OhIR1E8ZTEsTaho3bDQZidr9P10smH/awcew=
184+
github.com/fluxcd/pkg/cache v0.9.0 h1:EGKfOLMG3fOwWnH/4Axl5xd425mxoQbZzlZoLfd8PDk=
185+
github.com/fluxcd/pkg/cache v0.9.0/go.mod h1:jMwabjWfsC5lW8hE7NM3wtGNwSJ38Javx6EKbEi7INU=
182186
github.com/fluxcd/pkg/chartutil v1.3.0 h1:Zoc+AIyKL4YU4PaLL/iGv9VRLujeWT2Mvj4BLGFGKlg=
183187
github.com/fluxcd/pkg/chartutil v1.3.0/go.mod h1:O7eIdk0wgejua/8ikabfMFmwPv5mSDbHgZCyfTnL06U=
184188
github.com/fluxcd/pkg/envsubst v1.4.0 h1:pYsb6wrmXOSfHXuXQHaaBBMt3LumhgCb8SMdBNAwV/U=
185189
github.com/fluxcd/pkg/envsubst v1.4.0/go.mod h1:zSDFO3Wawi+vI2NPxsMQp+EkIsz/85MNg/s1Wzmqt+s=
186-
github.com/fluxcd/pkg/git v0.27.0 h1:/IHNNKQY2eopq3xWjUpvx6F3WmH2RqWQ3gmRyeBfcUg=
187-
github.com/fluxcd/pkg/git v0.27.0/go.mod h1:s0EFqP4jTKkUq0z/jSlsIhnIAl6HvPTnucrkSqRxE5Q=
188-
github.com/fluxcd/pkg/git/gogit v0.27.0 h1:JIlOHd3z8JWfe+Vnjz2dwBnF5faq9jjVhLqH1HhjxWU=
189-
github.com/fluxcd/pkg/git/gogit v0.27.0/go.mod h1:Jq7B+JKlZmKDlYk1CAVr2wfJJMLPlY8pK18g7UY7MaE=
190+
github.com/fluxcd/pkg/git v0.28.0 h1:by7XTOvj4ZUPH1alYMJtDCVryhHue+UfjhrnPuJt5vA=
191+
github.com/fluxcd/pkg/git v0.28.0/go.mod h1:VPv6O3mYnYvn79LOdWAFCl4fE8o651cxW/p/yxBoq2g=
192+
github.com/fluxcd/pkg/git/gogit v0.30.0 h1:tdKRT4EDV8Cc2tBX+bg4H4gdcND7M4OEl6DQy1jSJmo=
193+
github.com/fluxcd/pkg/git/gogit v0.30.0/go.mod h1:UCm/fOBuvX43BNz7Rc61Sukp2gBG/qxlOASaBkwMFvc=
190194
github.com/fluxcd/pkg/gittestserver v0.17.0 h1:JlBvWZQTDOI+np5Z+084m3DkeAH1hMusEybyRUDF63k=
191195
github.com/fluxcd/pkg/gittestserver v0.17.0/go.mod h1:E/40EmLoXcMqd6gLuLDC9F6KJxqHVGbBBeMNKk5XdxU=
192196
github.com/fluxcd/pkg/kustomize v1.17.0 h1:tLL8KvxHqTTZug3Q8TLvIbLC/ygEedOqdBock1r+Wiw=
193197
github.com/fluxcd/pkg/kustomize v1.17.0/go.mod h1:BxdXD7Fmfa63PIZRe2aP6KpDh2aXUfO7Yd/ljwhagPI=
194-
github.com/fluxcd/pkg/oci v0.46.0 h1:0AoCvP5YyRi6kPWu5ZTexzfTUXLomqYretwcWW7qpVU=
195-
github.com/fluxcd/pkg/oci v0.46.0/go.mod h1:Nt9WWbtVq9SST+ItKcTctRJ4BrK5va3wQvn1CEGI7XY=
198+
github.com/fluxcd/pkg/oci v0.47.1-0.20250504222034-ce6987524d7a h1:yzR8IAl8K/IQ7Z2KY5sCpkIHSwi9Yn+qvUcdTtmHxNc=
199+
github.com/fluxcd/pkg/oci v0.47.1-0.20250504222034-ce6987524d7a/go.mod h1:PC25RtwmaCBqZIolGK/K2H0Hy8a1IXOcLEwphlRdSFU=
196200
github.com/fluxcd/pkg/runtime v0.59.0 h1:3OrFkMJB39NcQ2vhhoxqls59sQVSn8U+thhyLbsQoA4=
197201
github.com/fluxcd/pkg/runtime v0.59.0/go.mod h1:MFbfyNyyoYRgPxpdwC9/dCOkzo7Yxhu/cQ9NKyhvqc0=
198202
github.com/fluxcd/pkg/sourceignore v0.12.0 h1:jCIe6d50rQ3wdXPF0+PhhqN0XrTRIq3upMomPelI8Mw=
@@ -227,6 +231,8 @@ github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMj
227231
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
228232
github.com/go-git/go-git/v5 v5.16.0 h1:k3kuOEpkc0DeY7xlL6NaaNg39xdgQbtH5mwCafHO9AQ=
229233
github.com/go-git/go-git/v5 v5.16.0/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
234+
github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
235+
github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
230236
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
231237
github.com/go-ldap/ldap/v3 v3.4.10 h1:ot/iwPOhfpNVgB1o+AVXljizWZ9JTp7YF5oeyONmcJU=
232238
github.com/go-ldap/ldap/v3 v3.4.10/go.mod h1:JXh4Uxgi40P6E9rdsYqpUtbW46D9UTjJ9QSwGRznplY=

‎internal/flags/source_oci_provider.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"strings"
2222

2323
"github.com/fluxcd/flux2/v2/internal/utils"
24-
"github.com/fluxcd/pkg/oci"
2524
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
2625
)
2726

@@ -32,13 +31,6 @@ var supportedSourceOCIProviders = []string{
3231
sourcev1.GoogleOCIProvider,
3332
}
3433

35-
var sourceOCIProvidersToOCIProvider = map[string]oci.Provider{
36-
sourcev1.GenericOCIProvider: oci.ProviderGeneric,
37-
sourcev1.AmazonOCIProvider: oci.ProviderAWS,
38-
sourcev1.AzureOCIProvider: oci.ProviderAzure,
39-
sourcev1.GoogleOCIProvider: oci.ProviderGCP,
40-
}
41-
4234
type SourceOCIProvider string
4335

4436
func (p *SourceOCIProvider) String() string {
@@ -68,12 +60,3 @@ func (p *SourceOCIProvider) Description() string {
6860
strings.Join(supportedSourceOCIProviders, ", "),
6961
)
7062
}
71-
72-
func (p *SourceOCIProvider) ToOCIProvider() (oci.Provider, error) {
73-
value, ok := sourceOCIProvidersToOCIProvider[p.String()]
74-
if !ok {
75-
return 0, fmt.Errorf("no mapping between source OCI provider %s and OCI provider", p.String())
76-
}
77-
78-
return value, nil
79-
}

0 commit comments

Comments
 (0)