Move the dynamic validator out of api/ (#3015)

Azure · Jul 19, 2023 · 4d57b4b · 4d57b4b
1 parent 220c6ff
commit 4d57b4b
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 18 deletions.
diff --git a/pkg/api/openshiftcluster.go b/pkg/api/openshiftcluster.go
@@ -312,7 +312,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/api/validate/dynamic/generate.go b/pkg/api/validate/dynamic/generate.go
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
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/validate/dynamic/generate.go b/pkg/validate/dynamic/generate.go
@@ -0,0 +1,12 @@
+package dynamic
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the Apache License 2.0.
+
+// XXX Using mockgen in source mode here to prevent mockgen from following
+//     type alias azcore.TokenCredential to an internal azcore subpackage.
+//     See https://github.com/golang/mock/issues/244
+
+//go:generate rm -rf ../../../pkg/util/mocks/$GOPACKAGE
+//go:generate go run ../../../vendor/github.com/golang/mock/mockgen -destination=../../../pkg/util/mocks/$GOPACKAGE/$GOPACKAGE.go -source=dynamic.go
+//go:generate go run ../../../vendor/golang.org/x/tools/cmd/goimports -local=github.com/Azure/ARO-RP -e -w ../../../pkg/util/mocks/$GOPACKAGE/$GOPACKAGE.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