fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle nil OCI authenticator with malformed registry 

Fixes #896

Signed-off-by: Adrien Fillon <adrien.fillon@manomano.com>
This commit is contained in:
Adrien Fillon 2022-09-13 19:53:41 +02:00
parent 9e853a909d
commit 03ba63bec3
No known key found for this signature in database
GPG Key ID: 98253819C2523FE5
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/helmrepository_controller_oci.go
View File

@ -382,5 +382,9 @@ func oidcAuthFromAdapter(ctx context.Context, url, provider string) (helmreg.Log
return nil, err return nil, err
} }
if auth == nil {
return nil, fmt.Errorf("could not validate OCI provider %s with URL %s", provider, url)
}
return registry.OIDCAdaptHelper(auth) return registry.OIDCAdaptHelper(auth)
} }

9
controllers/helmrepository_controller_oci_test.go
View File

@ -229,6 +229,15 @@ func TestHelmRepositoryOCIReconciler_authStrategy(t *testing.T) {
*conditions.FalseCondition(meta.ReadyCondition, sourcev1.AuthenticationFailedReason, "failed to get credential from"), *conditions.FalseCondition(meta.ReadyCondition, sourcev1.AuthenticationFailedReason, "failed to get credential from"),
}, },
}, },
{
name: "with contextual login provider and invalid repository URL",
wantErr: true,
provider: "aws",
providerImg: "oci://123456789000.dkr.ecr.us-east-2.amazonaws.com",
assertConditions: []metav1.Condition{
*conditions.FalseCondition(meta.ReadyCondition, sourcev1.AuthenticationFailedReason, "failed to get credential from"),
},
},
{ {
name: "with contextual login provider and secretRef", name: "with contextual login provider and secretRef",
want: ctrl.Result{RequeueAfter: interval}, want: ctrl.Result{RequeueAfter: interval},