azurerm_spring_cloud_connection, azurerm_app_service_connection: fix inaccurate storage blob resource id

internal/services/serviceconnector/helper.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/hashicorp/go-azure-sdk/resource-manager/servicelinker/2022-05-01/servicelinker"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/storage/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 	"github.com/hashicorp/terraform-provider-azurerm/utils"
@@ -20,6 +21,12 @@ type AuthInfoModel struct {
 	Certificate    string `tfschema:"certificate"`
 }
 
+type StorageBlobId struct {
+	SubscriptionId string
+	ResourceGroup  string
+	Name           string
+}
+
 func authInfoSchema() *pluginsdk.Schema {
 	return &pluginsdk.Schema{
 		Type:     pluginsdk.TypeList,
@@ -270,6 +277,14 @@ func flattenTargetService(input servicelinker.TargetServiceBase) string {
 	if value, ok := input.(servicelinker.AzureResource); ok {
 		if value.Id != nil {
 			targetServiceId = *value.Id
+			if parsedId, err := parse.StorageAccountDefaultBlobID(targetServiceId); err == nil {
+				storageAccountId := parse.StorageAccountId{
+					SubscriptionId: parsedId.SubscriptionId,
+					ResourceGroup:  parsedId.ResourceGroup,
+					Name:           parsedId.StorageAccountName,
+				}
+				targetServiceId = storageAccountId.ID()
+			}
 		}
 	}
 

internal/services/serviceconnector/service_connector_app_service_resource.go

@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/storage/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/web/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
@@ -123,9 +124,17 @@ func (r AppServiceConnectorResource) Create() sdk.ResourceFunc {
 
 			serviceConnectorProperties := servicelinker.LinkerProperties{
 				AuthInfo: authInfo,
-				TargetService: servicelinker.AzureResource{
+			}
+
+			if _, err := parse.StorageAccountID(model.TargetResourceId); err == nil {
+				targetResourceId := model.TargetResourceId + "/blobServices/default"
+				serviceConnectorProperties.TargetService = servicelinker.AzureResource{
+					Id: &targetResourceId,
+				}
+			} else {
+				serviceConnectorProperties.TargetService = servicelinker.AzureResource{
 					Id: &model.TargetResourceId,
-				},
+				}
 			}
 
 			if model.ClientType != "" {

internal/services/serviceconnector/service_connector_app_service_resource_test.go

@@ -47,6 +47,21 @@ func TestAccServiceConnectorAppServiceCosmosdb_basic(t *testing.T) {
 	})
 }
 
+func TestAccServiceConnectorAppServiceStorageBlob_basic(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_app_service_connection", "test")
+	r := ServiceConnectorAppServiceResource{}
+
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.storageBlob(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func TestAccServiceConnectorAppServiceCosmosdb_update(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_app_service_connection", "test")
 	r := ServiceConnectorAppServiceResource{}
@@ -83,6 +98,53 @@ func TestAccServiceConnectorAppService_complete(t *testing.T) {
 	})
 }
 
+func (r ServiceConnectorAppServiceResource) storageBlob(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+provider "azurerm" {
+  features {}
+}
+
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%[3]d"
+  location = "%[1]s"
+}
+
+resource "azurerm_storage_account" "test" {
+  name                     = "acctestacc%[2]s"
+  resource_group_name      = azurerm_resource_group.test.name
+  location                 = azurerm_resource_group.test.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+resource "azurerm_service_plan" "test" {
+  location            = azurerm_resource_group.test.location
+  name                = "testserviceplan%[2]s"
+  resource_group_name = azurerm_resource_group.test.name
+  sku_name            = "P1v2"
+  os_type             = "Linux"
+}
+
+resource "azurerm_linux_web_app" "test" {
+  location            = azurerm_resource_group.test.location
+  name                = "testlinuxwebapp%[2]s"
+  resource_group_name = azurerm_resource_group.test.name
+  service_plan_id     = azurerm_service_plan.test.id
+
+  site_config {}
+}
+
+resource "azurerm_app_service_connection" "test" {
+  name               = "acctestserviceconnector%[3]d"
+  app_service_id     = azurerm_linux_web_app.test.id
+  target_resource_id = azurerm_storage_account.test.id
+  authentication {
+    type = "systemAssignedIdentity"
+  }
+}
+`, data.Locations.Primary, data.RandomString, data.RandomInteger)
+}
+
 func (r ServiceConnectorAppServiceResource) cosmosdbBasic(data acceptance.TestData) string {
 	template := r.template(data)
 	return fmt.Sprintf(`

internal/services/serviceconnector/service_connector_spring_cloud_resource.go

@@ -12,6 +12,7 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/springcloud/validate"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/storage/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 	"github.com/hashicorp/terraform-provider-azurerm/utils"
@@ -124,9 +125,17 @@ func (r SpringCloudConnectorResource) Create() sdk.ResourceFunc {
 
 			serviceConnectorProperties := servicelinker.LinkerProperties{
 				AuthInfo: authInfo,
-				TargetService: servicelinker.AzureResource{
+			}
+
+			if _, err := parse.StorageAccountID(model.TargetResourceId); err == nil {
+				targetResourceId := model.TargetResourceId + "/blobServices/default"
+				serviceConnectorProperties.TargetService = servicelinker.AzureResource{
+					Id: &targetResourceId,
+				}
+			} else {
+				serviceConnectorProperties.TargetService = servicelinker.AzureResource{
 					Id: &model.TargetResourceId,
-				},
+				}
 			}
 
 			if model.ClientType != "" {

internal/services/serviceconnector/service_connector_spring_cloud_resource_test.go

@@ -47,6 +47,21 @@ func TestAccServiceConnectorSpringCloudCosmosdb_basic(t *testing.T) {
 	})
 }
 
+func TestAccServiceConnectorSpringCloudStorageBlob_basic(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_spring_cloud_connection", "test")
+	r := ServiceConnectorSpringCloudResource{}
+
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.storageBlob(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func TestAccServiceConnectorSpringCloudCosmosdb_update(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_spring_cloud_connection", "test")
 	r := ServiceConnectorSpringCloudResource{}
@@ -99,6 +114,57 @@ resource "azurerm_spring_cloud_connection" "test" {
 `, template, data.RandomString, data.RandomInteger)
 }
 
+func (r ServiceConnectorSpringCloudResource) storageBlob(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+provider "azurerm" {
+  features {}
+}
+
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%[2]d"
+  location = "%[1]s"
+}
+
+resource "azurerm_storage_account" "test" {
+  name                     = "acctestacc%[3]s"
+  resource_group_name      = azurerm_resource_group.test.name
+  location                 = azurerm_resource_group.test.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+resource "azurerm_spring_cloud_service" "test" {
+  name                = "testspringcloudservice-%[3]s"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+}
+
+resource "azurerm_spring_cloud_app" "test" {
+  name                = "testspringcloud-%[3]s"
+  resource_group_name = azurerm_resource_group.test.name
+  service_name        = azurerm_spring_cloud_service.test.name
+
+  identity {
+    type = "SystemAssigned"
+  }
+}
+
+resource "azurerm_spring_cloud_java_deployment" "test" {
+  name                = "deploy-%[3]s"
+  spring_cloud_app_id = azurerm_spring_cloud_app.test.id
+}
+
+resource "azurerm_spring_cloud_connection" "test" {
+  name               = "acctestserviceconnector%[2]d"
+  spring_cloud_id    = azurerm_spring_cloud_java_deployment.test.id
+  target_resource_id = azurerm_storage_account.test.id
+  authentication {
+    type = "systemAssignedIdentity"
+  }
+}
+`, data.Locations.Primary, data.RandomInteger, data.RandomString)
+}
+
 func (r ServiceConnectorSpringCloudResource) cosmosdbUpdate(data acceptance.TestData) string {
 	template := r.template(data)
 	return fmt.Sprintf(`

internal/services/storage/parse/storage_account_default_blob.go

@@ -0,0 +1,75 @@
+package parse
+
+// NOTE: this file is generated via 'go:generate' - manual changes will be overwritten
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids"
+)
+
+type StorageAccountDefaultBlobId struct {
+	SubscriptionId     string
+	ResourceGroup      string
+	StorageAccountName string
+	BlobServiceName    string
+}
+
+func NewStorageAccountDefaultBlobID(subscriptionId, resourceGroup, storageAccountName, blobServiceName string) StorageAccountDefaultBlobId {
+	return StorageAccountDefaultBlobId{
+		SubscriptionId:     subscriptionId,
+		ResourceGroup:      resourceGroup,
+		StorageAccountName: storageAccountName,
+		BlobServiceName:    blobServiceName,
+	}
+}
+
+func (id StorageAccountDefaultBlobId) String() string {
+	segments := []string{
+		fmt.Sprintf("Blob Service Name %q", id.BlobServiceName),
+		fmt.Sprintf("Storage Account Name %q", id.StorageAccountName),
+		fmt.Sprintf("Resource Group %q", id.ResourceGroup),
+	}
+	segmentsStr := strings.Join(segments, " / ")
+	return fmt.Sprintf("%s: (%s)", "Storage Account Default Blob", segmentsStr)
+}
+
+func (id StorageAccountDefaultBlobId) ID() string {
+	fmtString := "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Storage/storageAccounts/%s/blobServices/%s"
+	return fmt.Sprintf(fmtString, id.SubscriptionId, id.ResourceGroup, id.StorageAccountName, id.BlobServiceName)
+}
+
+// StorageAccountDefaultBlobID parses a StorageAccountDefaultBlob ID into an StorageAccountDefaultBlobId struct
+func StorageAccountDefaultBlobID(input string) (*StorageAccountDefaultBlobId, error) {
+	id, err := resourceids.ParseAzureResourceID(input)
+	if err != nil {
+		return nil, err
+	}
+
+	resourceId := StorageAccountDefaultBlobId{
+		SubscriptionId: id.SubscriptionID,
+		ResourceGroup:  id.ResourceGroup,
+	}
+
+	if resourceId.SubscriptionId == "" {
+		return nil, fmt.Errorf("ID was missing the 'subscriptions' element")
+	}
+
+	if resourceId.ResourceGroup == "" {
+		return nil, fmt.Errorf("ID was missing the 'resourceGroups' element")
+	}
+
+	if resourceId.StorageAccountName, err = id.PopSegment("storageAccounts"); err != nil {
+		return nil, err
+	}
+	if resourceId.BlobServiceName, err = id.PopSegment("blobServices"); err != nil {
+		return nil, err
+	}
+
+	if err := id.ValidateNoEmptySegments(input); err != nil {
+		return nil, err
+	}
+
+	return &resourceId, nil
+}