Improve error when SQL server doesn't have RG specified

- This fixes #1106.
Azure · Jun 23, 2020 · b327923 · b327923
1 parent d0ac904
commit b327923
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/api/v1alpha1/appinsights_types.go b/api/v1alpha1/appinsights_types.go
@@ -15,7 +15,7 @@ type AppInsightsSpec struct {
 	Kind                   string `json:"kind"`
 	Location               string `json:"location"`
 	ApplicationType        string `json:"applicationType"` // Possible values include 'web' or 'other'
-	ResourceGroup          string `json:"resourceGroup,omitempty"`
+	ResourceGroup          string `json:"resourceGroup"`
 	KeyVaultToStoreSecrets string `json:"keyVaultToStoreSecrets,omitempty"`
 }
 

diff --git a/api/v1alpha1/azuresqlserver_types.go b/api/v1alpha1/azuresqlserver_types.go
@@ -16,7 +16,7 @@ type AzureSqlServerSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 	Location               string `json:"location"`
-	ResourceGroup          string `json:"resourcegroup,omitempty"`
+	ResourceGroup          string `json:"resourcegroup"`
 	KeyVaultToStoreSecrets string `json:"keyVaultToStoreSecrets,omitempty"`
 }
 

diff --git a/api/v1beta1/azuresqlserver_types.go b/api/v1beta1/azuresqlserver_types.go
@@ -16,7 +16,7 @@ type AzureSqlServerSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 	Location               string `json:"location"`
-	ResourceGroup          string `json:"resourceGroup,omitempty"`
+	ResourceGroup          string `json:"resourceGroup"`
 	KeyVaultToStoreSecrets string `json:"keyVaultToStoreSecrets,omitempty"`
 }
 

diff --git a/pkg/resourcemanager/azuresql/azuresqlserver/azuresqlserver_reconcile.go b/pkg/resourcemanager/azuresql/azuresqlserver/azuresqlserver_reconcile.go
@@ -122,6 +122,13 @@ func (s *AzureSqlServerManager) Ensure(ctx context.Context, obj runtime.Object,
 	if instance.Status.Provisioning ||
 		(!specHashWasEmpty && instance.Status.SpecHash == hash) {
 
+		// TODO: This is a bit of a hack because really this check should be in the SDK.
+		// TODO: See: https://github.com/Azure/azure-sdk-for-go/issues/10712
+		if instance.Spec.ResourceGroup == "" {
+			instance.Status.Message = "A nonempty resource group must be specified."
+			return false, nil
+		}
+
 		serv, err := s.GetServer(ctx, instance.Spec.ResourceGroup, instance.Name)
 		if err != nil {
 			azerr := errhelp.NewAzureErrorAzureError(err)