From 4d57b4beb955965e2d9b282c18b1fae40bd4799f Mon Sep 17 00:00:00 2001
From: Amber Brown <ambrown@redhat.com>
Date: Thu, 20 Jul 2023 09:02:33 +1000
Subject: [PATCH] Move the dynamic validator out of api/ (#3015)

---
 pkg/api/openshiftcluster.go                          |  2 +-
 pkg/api/validate/dynamic/generate.go                 | 12 ------------
 pkg/cluster/validate.go                              |  2 +-
 .../checkers/serviceprincipalchecker/checker.go      |  2 +-
 .../checkers/serviceprincipalchecker/checker_test.go |  2 +-
 pkg/util/mocks/dynamic/dynamic.go                    |  2 +-
 pkg/{api => }/validate/dynamic/cache_vnet.go         |  0
 pkg/{api => }/validate/dynamic/diskencryptionset.go  |  0
 .../validate/dynamic/diskencryptionset_test.go       |  0
 pkg/{api => }/validate/dynamic/dynamic.go            |  0
 pkg/{api => }/validate/dynamic/dynamic_test.go       |  0
 pkg/{api => }/validate/dynamic/encryptionathost.go   |  0
 .../validate/dynamic/encryptionathost_test.go        |  0
 pkg/validate/dynamic/generate.go                     | 12 ++++++++++++
 pkg/{api => }/validate/dynamic/serviceprincipal.go   |  0
 .../validate/dynamic/serviceprincipal_test.go        |  0
 .../validate/openshiftcluster_validatedynamic.go     |  2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 pkg/api/validate/dynamic/generate.go
 rename pkg/{api => }/validate/dynamic/cache_vnet.go (100%)
 rename pkg/{api => }/validate/dynamic/diskencryptionset.go (100%)
 rename pkg/{api => }/validate/dynamic/diskencryptionset_test.go (100%)
 rename pkg/{api => }/validate/dynamic/dynamic.go (100%)
 rename pkg/{api => }/validate/dynamic/dynamic_test.go (100%)
 rename pkg/{api => }/validate/dynamic/encryptionathost.go (100%)
 rename pkg/{api => }/validate/dynamic/encryptionathost_test.go (100%)
 create mode 100644 pkg/validate/dynamic/generate.go
 rename pkg/{api => }/validate/dynamic/serviceprincipal.go (100%)
 rename pkg/{api => }/validate/dynamic/serviceprincipal_test.go (100%)
 rename pkg/{api => }/validate/openshiftcluster_validatedynamic.go (99%)

diff --git a/pkg/api/openshiftcluster.go b/pkg/api/openshiftcluster.go
index cb5e938cf28..548790dd186 100644
--- 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
deleted file mode 100644
index 88c2cca4bbd..00000000000
--- a/pkg/api/validate/dynamic/generate.go
+++ /dev/null
@@ -1,12 +0,0 @@
-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/cluster/validate.go b/pkg/cluster/validate.go
index 5662d42f096..f583d595b19 100644
--- 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
index b939e96ec26..7705372b13d 100644
--- 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
index 0fb59a7410b..ebf15f5f6a1 100644
--- 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
index 73808e002cc..10e3917291c 100644
--- a/pkg/util/mocks/dynamic/dynamic.go
+++ b/pkg/util/mocks/dynamic/dynamic.go
@@ -12,7 +12,7 @@ import (
 	gomock "github.com/golang/mock/gomock"
 
 	api "github.com/Azure/ARO-RP/pkg/api"
-	dynamic "github.com/Azure/ARO-RP/pkg/api/validate/dynamic"
+	dynamic "github.com/Azure/ARO-RP/pkg/validate/dynamic"
 )
 
 // MockServicePrincipalValidator is a mock of ServicePrincipalValidator interface.
diff --git a/pkg/api/validate/dynamic/cache_vnet.go b/pkg/validate/dynamic/cache_vnet.go
similarity index 100%
rename from pkg/api/validate/dynamic/cache_vnet.go
rename to pkg/validate/dynamic/cache_vnet.go
diff --git a/pkg/api/validate/dynamic/diskencryptionset.go b/pkg/validate/dynamic/diskencryptionset.go
similarity index 100%
rename from pkg/api/validate/dynamic/diskencryptionset.go
rename to pkg/validate/dynamic/diskencryptionset.go
diff --git a/pkg/api/validate/dynamic/diskencryptionset_test.go b/pkg/validate/dynamic/diskencryptionset_test.go
similarity index 100%
rename from pkg/api/validate/dynamic/diskencryptionset_test.go
rename to pkg/validate/dynamic/diskencryptionset_test.go
diff --git a/pkg/api/validate/dynamic/dynamic.go b/pkg/validate/dynamic/dynamic.go
similarity index 100%
rename from pkg/api/validate/dynamic/dynamic.go
rename to pkg/validate/dynamic/dynamic.go
diff --git a/pkg/api/validate/dynamic/dynamic_test.go b/pkg/validate/dynamic/dynamic_test.go
similarity index 100%
rename from pkg/api/validate/dynamic/dynamic_test.go
rename to pkg/validate/dynamic/dynamic_test.go
diff --git a/pkg/api/validate/dynamic/encryptionathost.go b/pkg/validate/dynamic/encryptionathost.go
similarity index 100%
rename from pkg/api/validate/dynamic/encryptionathost.go
rename to pkg/validate/dynamic/encryptionathost.go
diff --git a/pkg/api/validate/dynamic/encryptionathost_test.go b/pkg/validate/dynamic/encryptionathost_test.go
similarity index 100%
rename from pkg/api/validate/dynamic/encryptionathost_test.go
rename to pkg/validate/dynamic/encryptionathost_test.go
diff --git a/pkg/validate/dynamic/generate.go b/pkg/validate/dynamic/generate.go
new file mode 100644
index 00000000000..4c439040fe9
--- /dev/null
+++ 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 b/pkg/validate/dynamic/serviceprincipal.go
similarity index 100%
rename from pkg/api/validate/dynamic/serviceprincipal.go
rename to pkg/validate/dynamic/serviceprincipal.go
diff --git a/pkg/api/validate/dynamic/serviceprincipal_test.go b/pkg/validate/dynamic/serviceprincipal_test.go
similarity index 100%
rename from pkg/api/validate/dynamic/serviceprincipal_test.go
rename to pkg/validate/dynamic/serviceprincipal_test.go
diff --git a/pkg/api/validate/openshiftcluster_validatedynamic.go b/pkg/validate/openshiftcluster_validatedynamic.go
similarity index 99%
rename from pkg/api/validate/openshiftcluster_validatedynamic.go
rename to pkg/validate/openshiftcluster_validatedynamic.go
index 43b4897c81b..f0cfe178a91 100644
--- a/pkg/api/validate/openshiftcluster_validatedynamic.go
+++ b/pkg/validate/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