Merge branch 'master' into feature/lint-disclosures

Azure · Jul 14, 2021 · 4dca5a9 · 4dca5a9
2 parents 4e8fc26 + 77f01f2
commit 4dca5a9
Show file tree

Hide file tree

Showing 5 changed files with 669 additions and 497 deletions.
diff --git a/hack/generated/controllers/crd_servicebus_basic_test.go b/hack/generated/controllers/crd_servicebus_basic_test.go
@@ -11,7 +11,6 @@ import (
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	servicebusqueuetopic "github.com/Azure/azure-service-operator/hack/generated/_apis/microsoft.servicebus/v1alpha1api20180101preview"
 	servicebus "github.com/Azure/azure-service-operator/hack/generated/_apis/microsoft.servicebus/v1alpha1api20210101preview"
 	"github.com/Azure/azure-service-operator/hack/generated/pkg/testcommon"
 )
@@ -60,9 +59,9 @@ func Test_ServiceBus_Basic_CRUD(t *testing.T) {
 }
 
 func ServiceBus_Queue_CRUD(tc testcommon.KubePerTestContext, sbNamespace metav1.ObjectMeta) {
-	queue := &servicebusqueuetopic.NamespacesQueue{
+	queue := &servicebus.NamespacesQueue{
 		ObjectMeta: tc.MakeObjectMeta("queue"),
-		Spec: servicebusqueuetopic.NamespacesQueues_Spec{
+		Spec: servicebus.NamespacesQueues_Spec{
 			Location: &tc.AzureRegion,
 			Owner:    testcommon.AsOwner(sbNamespace),
 		},

diff --git a/hack/generated/controllers/crd_servicebus_standard_test.go b/hack/generated/controllers/crd_servicebus_standard_test.go
@@ -11,7 +11,6 @@ import (
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	servicebusqueuetopic "github.com/Azure/azure-service-operator/hack/generated/_apis/microsoft.servicebus/v1alpha1api20180101preview"
 	servicebus "github.com/Azure/azure-service-operator/hack/generated/_apis/microsoft.servicebus/v1alpha1api20210101preview"
 	"github.com/Azure/azure-service-operator/hack/generated/pkg/testcommon"
 )
@@ -63,9 +62,9 @@ func Test_ServiceBus_Standard_CRUD(t *testing.T) {
 
 // Topics can only be created in Standard or Premium SKUs
 func ServiceBus_Topic_CRUD(tc testcommon.KubePerTestContext, sbNamespace metav1.ObjectMeta) {
-	topic := &servicebusqueuetopic.NamespacesTopic{
+	topic := &servicebus.NamespacesTopic{
 		ObjectMeta: tc.MakeObjectMeta("topic"),
-		Spec: servicebusqueuetopic.NamespacesTopics_Spec{
+		Spec: servicebus.NamespacesTopics_Spec{
 			Location: &tc.AzureRegion,
 			Owner:    testcommon.AsOwner(sbNamespace),
 		},