Only parse access_connector_id if firewall is enabled

rizkybiz · May 8, 2024 · 1da6bd8 · 1da6bd8
1 parent 7073ad7
commit 1da6bd8
Showing 1 changed file with 24 additions and 21 deletions.
diff --git a/internal/services/databricks/databricks_workspace_resource.go b/internal/services/databricks/databricks_workspace_resource.go
@@ -584,33 +584,36 @@ func resourceDatabricksWorkspaceCreateUpdate(d *pluginsdk.ResourceData, meta int
 		encrypt.Entities.ManagedDisk.RotationToLatestKeyVersionEnabled = utils.Bool(rotationEnabled)
 	}
 
-	accessConnectorIdRaw := d.Get("access_connector_id").(string)
-	accessConnectorId, err := accessconnector.ParseAccessConnectorID(accessConnectorIdRaw)
+	accessConnectorProperties := workspaces.WorkspacePropertiesAccessConnector{}
 
-	if err != nil {
-		return fmt.Errorf("parsing Access Connector ID %s: %+v", accessConnectorIdRaw, err)
-	}
+	if defaultStorageFirewallEnabledRaw {
+		accessConnectorIdRaw := d.Get("access_connector_id").(string)
+		accessConnectorId, err := accessconnector.ParseAccessConnectorID(accessConnectorIdRaw)
 
-	accessConnector, err := acClient.Get(ctx, *accessConnectorId)
-	if err != nil {
-		return fmt.Errorf("retrieving Access Connector %s: %+v", accessConnectorId.AccessConnectorName, err)
-	}
+		if err != nil {
+			return fmt.Errorf("parsing Access Connector ID %s: %+v", accessConnectorIdRaw, err)
+		}
 
-	accessConnectorProperties := workspaces.WorkspacePropertiesAccessConnector{}
-	if accessConnector.Model.Identity != nil {
+		accessConnector, err := acClient.Get(ctx, *accessConnectorId)
+		if err != nil {
+			return fmt.Errorf("retrieving Access Connector %s: %+v", accessConnectorId.AccessConnectorName, err)
+		}
+
+		if accessConnector.Model.Identity != nil {
 
-		accIdentityId := ""
-		for raw := range accessConnector.Model.Identity.IdentityIds {
-			id, err := commonids.ParseUserAssignedIdentityIDInsensitively(raw)
-			if err != nil {
-				return fmt.Errorf("parsing %q as a User Assigned Identity ID: %+v", raw, err)
+			accIdentityId := ""
+			for raw := range accessConnector.Model.Identity.IdentityIds {
+				id, err := commonids.ParseUserAssignedIdentityIDInsensitively(raw)
+				if err != nil {
+					return fmt.Errorf("parsing %q as a User Assigned Identity ID: %+v", raw, err)
+				}
+				accIdentityId = id.ID()
 			}
-			accIdentityId = id.ID()
-		}
 
-		accessConnectorProperties.Id = *accessConnector.Model.Id
-		accessConnectorProperties.IdentityType = workspaces.IdentityType(accessConnector.Model.Identity.Type)
-		accessConnectorProperties.UserAssignedIdentityId = &accIdentityId
+			accessConnectorProperties.Id = *accessConnector.Model.Id
+			accessConnectorProperties.IdentityType = workspaces.IdentityType(accessConnector.Model.Identity.Type)
+			accessConnectorProperties.UserAssignedIdentityId = &accIdentityId
+		}
 	}
 
 	// Including the Tags in the workspace parameters will update the tags on