New Resource: azurerm_container_app_connection

Author: Jiawei Tao

internal/services/serviceconnector/container_app_connection_resource.go

@@ -34,6 +34,7 @@ type ContainerAppConnectorResourceModel struct {
 	AuthInfo         []AuthInfoModel    `tfschema:"authentication"`
 	VnetSolution     string             `tfschema:"vnet_solution"`
 	SecretStore      []SecretStoreModel `tfschema:"secret_store"`
+	Scope            string             `tfschema:"scope"`
 }
 
 func (r ContainerAppConnectorResource) Arguments() map[string]*schema.Schema {
@@ -59,6 +60,13 @@ func (r ContainerAppConnectorResource) Arguments() map[string]*schema.Schema {
 			ValidateFunc: azure.ValidateResourceID,
 		},
 
+		"scope": {
+			Type:         pluginsdk.TypeString,
+			Required:     true,
+			ForceNew:     true,
+			ValidateFunc: validation.StringIsNotEmpty,
+		},
+
 		"client_type": {
 			Type:     pluginsdk.TypeString,
 			Optional: true,
@@ -132,12 +140,14 @@ func (r ContainerAppConnectorResource) Create() sdk.ResourceFunc {
 
 			serviceConnectorProperties := servicelinker.LinkerProperties{
 				AuthInfo: authInfo,
+				Scope:    pointer.To(model.Scope),
 			}
 
 			if storageAccountId, err := commonids.ParseStorageAccountID(model.TargetResourceId); err == nil {
 				targetResourceId := fmt.Sprintf("%s/blobServices/default", storageAccountId.ID())
 				serviceConnectorProperties.TargetService = servicelinker.AzureResource{
-					Id: &targetResourceId,
+					Id:   &targetResourceId,
+					Type: servicelinker.TargetServiceTypeAzureResource,
 				}
 			} else {
 				serviceConnectorProperties.TargetService = servicelinker.AzureResource{
@@ -210,6 +220,7 @@ func (r ContainerAppConnectorResource) Read() sdk.ResourceFunc {
 					ContainerAppId:   id.ResourceUri,
 					TargetResourceId: flattenTargetService(props.TargetService),
 					AuthInfo:         flattenServiceConnectorAuthInfo(props.AuthInfo, pwd),
+					Scope:            pointer.From(props.Scope),
 				}
 
 				if props.ClientType != nil {

internal/services/serviceconnector/container_app_connection_resource_test.go

@@ -208,6 +208,7 @@ resource "azurerm_container_app_connection" "test" {
   name               = "acctestserviceconnector%[3]d"
   container_app_id   = azurerm_container_app.test.id
   target_resource_id = azurerm_cosmosdb_sql_database.test.id
+  scope              = azurerm_container_app.test.template[0].container[0].name
   authentication {
     type = "systemAssignedIdentity"
   }
@@ -224,6 +225,7 @@ resource "azurerm_container_app_connection" "test" {
   name               = "acctestserviceconnector%[2]d"
   container_app_id   = azurerm_container_app.test.id
   target_resource_id = azurerm_cosmosdb_sql_database.test.id
+  scope              = azurerm_container_app.test.template[0].container[0].name
   authentication {
     type   = "secret"
     name   = "foo"
@@ -248,6 +250,7 @@ resource "azurerm_container_app_connection" "test" {
   name               = "acctestserviceconnector%[3]d"
   container_app_id   = azurerm_container_app.test.id
   target_resource_id = azurerm_cosmosdb_sql_database.test.id
+  scope              = azurerm_container_app.test.template[0].container[0].name
   authentication {
     type         = "servicePrincipalSecret"
     client_id    = "someclientid"
@@ -275,6 +278,7 @@ resource "azurerm_container_app_connection" "test" {
   name               = "acctestserviceconnector%[3]d"
   container_app_id   = azurerm_container_app.test.id
   target_resource_id = azurerm_cosmosdb_sql_database.test.id
+  scope              = azurerm_container_app.test.template[0].container[0].name
   authentication {
     type            = "userAssignedIdentity"
     subscription_id = data.azurerm_subscription.test.subscription_id
@@ -336,6 +340,7 @@ resource "azurerm_container_app" "test" {
     ignore_changes = [
       template[0].container[0].env,
       identity,
+      secret,
     ]
   }
 }
@@ -459,6 +464,7 @@ resource "azurerm_container_app" "test" {
     ignore_changes = [
       template[0].container[0].env,
       identity,
+      secret,
     ]
   }
 }
@@ -539,6 +545,7 @@ resource "azurerm_container_app" "test" {
     ignore_changes = [
       template[0].container[0].env,
       identity,
+      secret,
     ]
   }
 }