made changes according to tsatam comments

Azure · Jul 28, 2023 · f12b002 · f12b002
1 parent b32fb4d
commit f12b002
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/pkg/validate/dynamic/encryptionathost.go b/pkg/validate/dynamic/encryptionathost.go
@@ -17,7 +17,7 @@ func (dv *dynamic) ValidateEncryptionAtHost(ctx context.Context, oc *api.OpenShi
 	dv.log.Print("ValidateEncryptionAtHost")
 
 	if oc.Properties.MasterProfile.EncryptionAtHost == api.EncryptionAtHostEnabled {
-		if err := dv.IsRegisteredForFeature(sub); err != nil {
+		if err := dv.IsRegisteredForEncryptionAtHostFeature(sub); err != nil {
 			return err
 		}
 		err := dv.validateEncryptionAtHostSupport(oc.Properties.MasterProfile.VMSize, "properties.masterProfile.encryptionAtHost")
@@ -28,7 +28,7 @@ func (dv *dynamic) ValidateEncryptionAtHost(ctx context.Context, oc *api.OpenShi
 
 	for i, wp := range oc.Properties.WorkerProfiles {
 		if wp.EncryptionAtHost == api.EncryptionAtHostEnabled {
-			if err := dv.IsRegisteredForFeature(sub); err != nil {
+			if err := dv.IsRegisteredForEncryptionAtHostFeature(sub); err != nil {
 				return err
 			}
 			err := dv.validateEncryptionAtHostSupport(wp.VMSize, fmt.Sprintf("properties.workerProfiles[%d].encryptionAtHost", i))
@@ -54,7 +54,7 @@ func (dv *dynamic) validateEncryptionAtHostSupport(VMSize api.VMSize, path strin
 	return nil
 }
 
-func (dv *dynamic) IsRegisteredForFeature(sub *api.SubscriptionProperties) error {
+func (dv *dynamic) IsRegisteredForEncryptionAtHostFeature(sub *api.SubscriptionProperties) error {
 	for _, f := range sub.RegisteredFeatures {
 		featureName := strings.ToLower(f.Name)
 		if featureName == strings.ToLower("Microsoft.Compute/EncryptionAtHost") && f.State == "Registered" {

diff --git a/pkg/validate/dynamic/encryptionathost_test.go b/pkg/validate/dynamic/encryptionathost_test.go
@@ -46,15 +46,11 @@ func TestValidateEncryptionAtHost(t *testing.T) {
 		}
 	}
 
-	EncryptionAtHostEnabledOrDisabled := func(MasterEncryptionAtHost api.EncryptionAtHost, WorkerEncryptionAtHost api.EncryptionAtHost) *api.OpenShiftCluster {
+	EncryptionAtHostEnabledOrDisabled := func(MasterProfile api.MasterProfile, WorkerProfiles []api.WorkerProfile) *api.OpenShiftCluster {
 		return &api.OpenShiftCluster{
 			Properties: api.OpenShiftClusterProperties{
-				MasterProfile: api.MasterProfile{
-					EncryptionAtHost: MasterEncryptionAtHost,
-				},
-				WorkerProfiles: []api.WorkerProfile{{
-					EncryptionAtHost: WorkerEncryptionAtHost,
-				}},
+				MasterProfile:  MasterProfile,
+				WorkerProfiles: WorkerProfiles,
 			},
 		}
 	}
@@ -78,19 +74,19 @@ func TestValidateEncryptionAtHost(t *testing.T) {
 		},
 		{
 			name:    "encryption at host enabled - feature isn't registered",
-			oc:      EncryptionAtHostEnabledOrDisabled(api.EncryptionAtHostEnabled, api.EncryptionAtHostEnabled),
+			oc:      EncryptionAtHostEnabledOrDisabled(api.MasterProfile{EncryptionAtHost: api.EncryptionAtHostEnabled}, []api.WorkerProfile{{EncryptionAtHost: api.EncryptionAtHostEnabled}}),
 			sub:     &api.SubscriptionProperties{},
 			wantErr: "400: InvalidParameter: api.SubscriptionProperties.RegisteredFeatures: Microsoft.Compute/EncryptionAtHost feature is not enabled for this subscription. Register the feature using 'az feature register --namespace Microsoft.Compute --name EncryptionAtHost'",
 		},
 		{
 			name:    "MasterProfile encryption at host enabled - feature isn't registered",
-			oc:      EncryptionAtHostEnabledOrDisabled(api.EncryptionAtHostEnabled, api.EncryptionAtHostDisabled),
+			oc:      EncryptionAtHostEnabledOrDisabled(api.MasterProfile{EncryptionAtHost: api.EncryptionAtHostEnabled}, []api.WorkerProfile{{EncryptionAtHost: api.EncryptionAtHostDisabled}}),
 			sub:     &api.SubscriptionProperties{},
 			wantErr: "400: InvalidParameter: api.SubscriptionProperties.RegisteredFeatures: Microsoft.Compute/EncryptionAtHost feature is not enabled for this subscription. Register the feature using 'az feature register --namespace Microsoft.Compute --name EncryptionAtHost'",
 		},
 		{
 			name:    "WorkerProfiles encryption at host enabled - feature isn't registered",
-			oc:      EncryptionAtHostEnabledOrDisabled(api.EncryptionAtHostDisabled, api.EncryptionAtHostEnabled),
+			oc:      EncryptionAtHostEnabledOrDisabled(api.MasterProfile{EncryptionAtHost: api.EncryptionAtHostDisabled}, []api.WorkerProfile{{EncryptionAtHost: api.EncryptionAtHostEnabled}}),
 			sub:     &api.SubscriptionProperties{},
 			wantErr: "400: InvalidParameter: api.SubscriptionProperties.RegisteredFeatures: Microsoft.Compute/EncryptionAtHost feature is not enabled for this subscription. Register the feature using 'az feature register --namespace Microsoft.Compute --name EncryptionAtHost'",
 		},