Skip to content

Commit e75d091

Browse files
mabulgumabulgu
committed
move validator under secretutils
Signed-off-by: mabulgu <mabulgu@gmail.com>
1 parent 402e14c commit e75d091

3 files changed

Lines changed: 15 additions & 17 deletions

File tree

‎internal/controller/metal3.io/baremetalhost_controller.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
metal3api "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1"
3030
"github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1/profile"
3131
"github.com/metal3-io/baremetal-operator/pkg/hardwareutils/bmc"
32-
"github.com/metal3-io/baremetal-operator/pkg/imageauthvalidator"
3332
"github.com/metal3-io/baremetal-operator/pkg/imageprovider"
3433
"github.com/metal3-io/baremetal-operator/pkg/provisioner"
3534
"github.com/metal3-io/baremetal-operator/pkg/secretutils"
@@ -2262,14 +2261,14 @@ func (r *BareMetalHostReconciler) getImageAuthSecret(ctx context.Context, _ ctrl
22622261
return "", nil
22632262
}
22642263

2265-
// Use the validator to validate and extract credentials
2266-
validator := imageauthvalidator.New(r.Client, r.Recorder)
2264+
// Validate and extract credentials
2265+
validator := secretutils.NewValidator(r.Client, r.Recorder)
22672266
result, err := validator.Validate(ctx, host)
22682267
if err != nil {
22692268
return "", fmt.Errorf("failed to validate auth secret: %w", err)
22702269
}
22712270

2272-
// If validation failed, return empty (validator already emitted events)
2271+
// If validation failed, return empty (secretutils already emitted events)
22732272
if !result.Valid {
22742273
return "", nil
22752274
}

pkg/imageauthvalidator/validator.go renamed to pkg/secretutils/validator.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package imageauthvalidator
1+
package secretutils
22

33
import (
44
"context"
55
"strings"
66

77
metal3api "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1"
8-
"github.com/metal3-io/baremetal-operator/pkg/secretutils"
98
corev1 "k8s.io/api/core/v1"
109
k8serrors "k8s.io/apimachinery/pkg/api/errors"
1110
"k8s.io/apimachinery/pkg/types"
@@ -37,7 +36,7 @@ type validator struct {
3736
recorder record.EventRecorder
3837
}
3938

40-
func New(c client.Client, recorder record.EventRecorder) Validator {
39+
func NewValidator(c client.Client, recorder record.EventRecorder) Validator {
4140
return &validator{c: c, recorder: recorder}
4241
}
4342

@@ -82,7 +81,7 @@ func (v *validator) Validate(ctx context.Context, bmh *metal3api.BareMetalHost)
8281

8382
// For OCI images, extract the credentials from the Docker config
8483
if ociRelevant {
85-
credentials, err := secretutils.ExtractRegistryCredentials(&sec, img.URL)
84+
credentials, err := ExtractRegistryCredentials(&sec, img.URL)
8685
if err != nil {
8786
if v.recorder != nil {
8887
v.recorder.Eventf(bmh, corev1.EventTypeWarning, "ImageAuthParseError",

pkg/imageauthvalidator/validator_test.go renamed to pkg/secretutils/validator_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package imageauthvalidator
1+
package secretutils
22

33
import (
44
"encoding/base64"
@@ -21,7 +21,7 @@ func TestValidate_NoAuthSecret(t *testing.T) {
2121

2222
c := fake.NewClientBuilder().WithScheme(scheme).Build()
2323
recorder := record.NewFakeRecorder(10)
24-
validator := New(c, recorder)
24+
validator := NewValidator(c, recorder)
2525

2626
bmh := &metal3api.BareMetalHost{
2727
ObjectMeta: metav1.ObjectMeta{
@@ -56,7 +56,7 @@ func TestValidate_SecretNotFound(t *testing.T) {
5656

5757
c := fake.NewClientBuilder().WithScheme(scheme).Build()
5858
recorder := record.NewFakeRecorder(10)
59-
validator := New(c, recorder)
59+
validator := NewValidator(c, recorder)
6060

6161
secretName := "my-secret"
6262
bmh := &metal3api.BareMetalHost{
@@ -105,7 +105,7 @@ func TestValidate_WrongSecretType(t *testing.T) {
105105

106106
c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(secret).Build()
107107
recorder := record.NewFakeRecorder(10)
108-
validator := New(c, recorder)
108+
validator := NewValidator(c, recorder)
109109

110110
bmh := &metal3api.BareMetalHost{
111111
ObjectMeta: metav1.ObjectMeta{
@@ -177,7 +177,7 @@ func TestValidate_ValidDockerConfigJSON(t *testing.T) {
177177

178178
c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(secret).Build()
179179
recorder := record.NewFakeRecorder(10)
180-
validator := New(c, recorder)
180+
validator := NewValidator(c, recorder)
181181

182182
bmh := &metal3api.BareMetalHost{
183183
ObjectMeta: metav1.ObjectMeta{
@@ -257,7 +257,7 @@ func TestValidate_RegistryNotInSecret(t *testing.T) {
257257

258258
c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(secret).Build()
259259
recorder := record.NewFakeRecorder(10)
260-
validator := New(c, recorder)
260+
validator := NewValidator(c, recorder)
261261

262262
bmh := &metal3api.BareMetalHost{
263263
ObjectMeta: metav1.ObjectMeta{
@@ -337,7 +337,7 @@ func TestValidate_NonOCIImageWithSecret(t *testing.T) {
337337

338338
c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(secret).Build()
339339
recorder := record.NewFakeRecorder(10)
340-
validator := New(c, recorder)
340+
validator := NewValidator(c, recorder)
341341

342342
bmh := &metal3api.BareMetalHost{
343343
ObjectMeta: metav1.ObjectMeta{
@@ -382,7 +382,7 @@ func TestValidate_NilImage(t *testing.T) {
382382

383383
c := fake.NewClientBuilder().WithScheme(scheme).Build()
384384
recorder := record.NewFakeRecorder(10)
385-
validator := New(c, recorder)
385+
validator := NewValidator(c, recorder)
386386

387387
bmh := &metal3api.BareMetalHost{
388388
ObjectMeta: metav1.ObjectMeta{
@@ -512,7 +512,7 @@ func TestIntegration_ValidateAndExtractCredentials(t *testing.T) {
512512
)
513513

514514
recorder := record.NewFakeRecorder(10)
515-
validator := New(c, recorder)
515+
validator := NewValidator(c, recorder)
516516

517517
result, err := validator.Validate(t.Context(), bmh)
518518
if err != nil {

0 commit comments

Comments
 (0)