Move the dynamic validator out of api/

Azure · Jul 10, 2023 · c7a5fa4 · c7a5fa4
1 parent 629913b
commit c7a5fa4
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 14 deletions.
diff --git a/pkg/api/openshiftcluster.go b/pkg/api/openshiftcluster.go
@@ -309,7 +309,7 @@ type MasterProfile struct {
 type VMSize string
 
 // VMSize constants
-// add required resources in pkg/api/validate/dynamic/quota.go when adding a new VMSize
+// add required resources in pkg/validate/dynamic/quota.go when adding a new VMSize
 const (
 	VMSizeStandardD2sV3  VMSize = "Standard_D2s_v3"
 	VMSizeStandardD4sV3  VMSize = "Standard_D4s_v3"

diff --git a/pkg/cluster/validate.go b/pkg/cluster/validate.go
@@ -7,7 +7,7 @@ import (
 	"context"
 
 	"github.com/Azure/ARO-RP/pkg/api"
-	"github.com/Azure/ARO-RP/pkg/api/validate"
+	"github.com/Azure/ARO-RP/pkg/validate"
 )
 
 func (m *manager) validateResources(ctx context.Context) error {

diff --git a/pkg/operator/controllers/checkers/serviceprincipalchecker/checker.go b/pkg/operator/controllers/checkers/serviceprincipalchecker/checker.go
@@ -10,9 +10,9 @@ import (
 	"github.com/sirupsen/logrus"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/Azure/ARO-RP/pkg/api/validate/dynamic"
 	"github.com/Azure/ARO-RP/pkg/util/azureclient"
 	"github.com/Azure/ARO-RP/pkg/util/clusterauthorizer"
+	"github.com/Azure/ARO-RP/pkg/validate/dynamic"
 )
 
 type servicePrincipalChecker interface {

diff --git a/pkg/operator/controllers/checkers/serviceprincipalchecker/checker_test.go b/pkg/operator/controllers/checkers/serviceprincipalchecker/checker_test.go
@@ -15,10 +15,10 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/sirupsen/logrus"
 
-	"github.com/Azure/ARO-RP/pkg/api/validate/dynamic"
 	"github.com/Azure/ARO-RP/pkg/util/azureclient"
 	"github.com/Azure/ARO-RP/pkg/util/clusterauthorizer"
 	mock_dynamic "github.com/Azure/ARO-RP/pkg/util/mocks/dynamic"
+	"github.com/Azure/ARO-RP/pkg/validate/dynamic"
 	utilerror "github.com/Azure/ARO-RP/test/util/error"
 )
 

diff --git a/pkg/util/mocks/dynamic/dynamic.go b/pkg/util/mocks/dynamic/dynamic.go
diff --git a/pkg/api/validate/dynamic/cache_vnet.go → pkg/validate/dynamic/cache_vnet.go b/pkg/api/validate/dynamic/cache_vnet.go → pkg/validate/dynamic/cache_vnet.go
diff --git a/...api/validate/dynamic/diskencryptionset.go → pkg/validate/dynamic/diskencryptionset.go b/...api/validate/dynamic/diskencryptionset.go → pkg/validate/dynamic/diskencryptionset.go
diff --git a/...alidate/dynamic/diskencryptionset_test.go → ...alidate/dynamic/diskencryptionset_test.go b/...alidate/dynamic/diskencryptionset_test.go → ...alidate/dynamic/diskencryptionset_test.go
diff --git a/pkg/api/validate/dynamic/dynamic.go → pkg/validate/dynamic/dynamic.go b/pkg/api/validate/dynamic/dynamic.go → pkg/validate/dynamic/dynamic.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	"github.com/Azure/ARO-RP/pkg/api"
+	api_subnet "github.com/Azure/ARO-RP/pkg/api/util/subnet"
 	"github.com/Azure/ARO-RP/pkg/env"
 	"github.com/Azure/ARO-RP/pkg/util/azureclient"
 	"github.com/Azure/ARO-RP/pkg/util/azureclient/authz/remotepdp"
@@ -29,7 +30,6 @@ import (
 	"github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/network"
 	"github.com/Azure/ARO-RP/pkg/util/permissions"
 	"github.com/Azure/ARO-RP/pkg/util/steps"
-	"github.com/Azure/ARO-RP/pkg/util/subnet"
 	"github.com/Azure/ARO-RP/pkg/util/token"
 )
 
@@ -160,7 +160,7 @@ func (dv *dynamic) ValidateVnet(
 	// get unique vnets from subnets
 	vnets := make(map[string]azure.Resource)
 	for _, s := range subnets {
-		vnetID, _, err := subnet.Split(s.ID)
+		vnetID, _, err := api_subnet.Split(s.ID)
 		if err != nil {
 			return err
 		}
@@ -260,7 +260,7 @@ func (dv *dynamic) validateVnetPermissions(ctx context.Context, vnet azure.Resou
 func (dv *dynamic) validateRouteTablePermissions(ctx context.Context, s Subnet) error {
 	dv.log.Printf("validateRouteTablePermissions")
 
-	vnetID, _, err := subnet.Split(s.ID)
+	vnetID, _, err := api_subnet.Split(s.ID)
 	if err != nil {
 		return err
 	}
@@ -322,7 +322,7 @@ func (dv *dynamic) validateRouteTablePermissions(ctx context.Context, s Subnet)
 func (dv *dynamic) validateNatGatewayPermissions(ctx context.Context, s Subnet) error {
 	dv.log.Printf("validateNatGatewayPermissions")
 
-	vnetID, _, err := subnet.Split(s.ID)
+	vnetID, _, err := api_subnet.Split(s.ID)
 	if err != nil {
 		return err
 	}
@@ -530,7 +530,7 @@ func (dv *dynamic) validateCIDRRanges(ctx context.Context, subnets []Subnet, add
 
 	// unique names of subnets from all node pools
 	for _, s := range subnets {
-		vnetID, _, err := subnet.Split(s.ID)
+		vnetID, _, err := api_subnet.Split(s.ID)
 		if err != nil {
 			return err
 		}
@@ -619,7 +619,7 @@ func (dv *dynamic) createSubnetMapByID(ctx context.Context, subnets []Subnet) (m
 	subnetByID := make(map[string]*mgmtnetwork.Subnet)
 
 	for _, s := range subnets {
-		vnetID, _, err := subnet.Split(s.ID)
+		vnetID, _, err := api_subnet.Split(s.ID)
 		if err != nil {
 			return nil, err
 		}
@@ -709,7 +709,7 @@ func (dv *dynamic) ValidateSubnets(ctx context.Context, oc *api.OpenShiftCluster
 
 		if oc.Properties.ProvisioningState == api.ProvisioningStateCreating {
 			if subnetHasNSGAttached(ss) && oc.Properties.NetworkProfile.PreconfiguredNSG != api.PreconfiguredNSGEnabled {
-				expectedNsgID, err := subnet.NetworkSecurityGroupID(oc, s.ID)
+				expectedNsgID, err := api_subnet.NetworkSecurityGroupID(oc, s.ID)
 				if err != nil {
 					return err
 				}
@@ -721,7 +721,7 @@ func (dv *dynamic) ValidateSubnets(ctx context.Context, oc *api.OpenShiftCluster
 				}
 			}
 		} else {
-			nsgID, err := subnet.NetworkSecurityGroupID(oc, *ss.ID)
+			nsgID, err := api_subnet.NetworkSecurityGroupID(oc, *ss.ID)
 			if err != nil {
 				return err
 			}

diff --git a/pkg/api/validate/dynamic/dynamic_test.go → pkg/validate/dynamic/dynamic_test.go b/pkg/api/validate/dynamic/dynamic_test.go → pkg/validate/dynamic/dynamic_test.go
diff --git a/pkg/api/validate/dynamic/encryptionathost.go → pkg/validate/dynamic/encryptionathost.go b/pkg/api/validate/dynamic/encryptionathost.go → pkg/validate/dynamic/encryptionathost.go
diff --git a/...validate/dynamic/encryptionathost_test.go → ...validate/dynamic/encryptionathost_test.go b/...validate/dynamic/encryptionathost_test.go → ...validate/dynamic/encryptionathost_test.go
diff --git a/pkg/api/validate/dynamic/generate.go → pkg/validate/dynamic/generate.go b/pkg/api/validate/dynamic/generate.go → pkg/validate/dynamic/generate.go
diff --git a/pkg/api/validate/dynamic/serviceprincipal.go → pkg/validate/dynamic/serviceprincipal.go b/pkg/api/validate/dynamic/serviceprincipal.go → pkg/validate/dynamic/serviceprincipal.go
diff --git a/...validate/dynamic/serviceprincipal_test.go → ...validate/dynamic/serviceprincipal_test.go b/...validate/dynamic/serviceprincipal_test.go → ...validate/dynamic/serviceprincipal_test.go
diff --git a/...idate/openshiftcluster_validatedynamic.go → ...idate/openshiftcluster_validatedynamic.go b/...idate/openshiftcluster_validatedynamic.go → ...idate/openshiftcluster_validatedynamic.go
@@ -19,10 +19,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	"github.com/Azure/ARO-RP/pkg/api"
-	"github.com/Azure/ARO-RP/pkg/api/validate/dynamic"
 	"github.com/Azure/ARO-RP/pkg/env"
 	"github.com/Azure/ARO-RP/pkg/util/azureclient/authz/remotepdp"
 	"github.com/Azure/ARO-RP/pkg/util/feature"
+	"github.com/Azure/ARO-RP/pkg/validate/dynamic"
 )
 
 // OpenShiftClusterDynamicValidator is the dynamic validator interface