mirror of
https://github.com/fluxcd/flux2.git
synced 2025-10-27 20:55:09 +08:00
4c343893c5
Update fluxcd/pkg/auth to v0.18.0 and simplify error handling for GetArtifactRegistryCredentials() following the improvements made in the library. Similar to fluxcd/image-reflector-controller#786, this removes unnecessary nil checks as the function now returns errors directly for unsupported providers. - Replace authentication code in push_artifact.go with loginWithProvider() - Remove unnecessary authenticator nil check in oci.go - Remove unused imports (errors, auth packages) Signed-off-by: cappyzawa <cappyzawa@gmail.com>
42 lines
1.3 KiB
Go
42 lines
1.3 KiB
Go
/*
|
|
Copyright 2025 The Flux authors
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/google/go-containerregistry/pkg/crane"
|
|
|
|
"github.com/fluxcd/pkg/auth"
|
|
"github.com/fluxcd/pkg/auth/azure"
|
|
authutils "github.com/fluxcd/pkg/auth/utils"
|
|
)
|
|
|
|
// loginWithProvider gets a crane authentication option for the given provider and URL.
|
|
func loginWithProvider(ctx context.Context, url, provider string) (crane.Option, error) {
|
|
var opts []auth.Option
|
|
if provider == azure.ProviderName {
|
|
opts = append(opts, auth.WithAllowShellOut())
|
|
}
|
|
authenticator, err := authutils.GetArtifactRegistryCredentials(ctx, provider, url, opts...)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not login to provider %s with url %s: %w", provider, url, err)
|
|
}
|
|
return crane.WithAuth(authenticator), nil
|
|
}
|