Merge pull request #7531 from njuCZ/spring_cloud_update

add support for `sku_name` and `trace` for `azurerm_spring_cloud_service`

Author: tombuildsstuff

azurerm/internal/services/appplatform/spring_cloud_service_resource.go

@@ -53,6 +53,17 @@ func resourceArmSpringCloudService() *schema.Resource {
 
 			"resource_group_name": azure.SchemaResourceGroupName(),
 
+			"sku_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "S0",
+				ForceNew: true,
+				ValidateFunc: validation.StringInSlice([]string{
+					"B0",
+					"S0",
+				}, false),
+			},
+
 			"config_server_git_setting": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -133,6 +144,20 @@ func resourceArmSpringCloudService() *schema.Resource {
 				},
 			},
 
+			"trace": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"instrumentation_key": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -159,7 +184,13 @@ func resourceArmSpringCloudServiceCreate(d *schema.ResourceData, meta interface{
 	location := azure.NormalizeLocation(d.Get("location").(string))
 	resource := appplatform.ServiceResource{
 		Location: utils.String(location),
-		Tags:     tags.Expand(d.Get("tags").(map[string]interface{})),
+		Properties: &appplatform.ClusterResourceProperties{
+			Trace: expandArmSpringCloudTrace(d.Get("trace").([]interface{})),
+		},
+		Sku: &appplatform.Sku{
+			Name: utils.String(d.Get("sku_name").(string)),
+		},
+		Tags: tags.Expand(d.Get("tags").(map[string]interface{})),
 	}
 
 	gitProperty, err := expandArmSpringCloudConfigServerGitProperty(d.Get("config_server_git_setting").([]interface{}))
@@ -233,6 +264,10 @@ func resourceArmSpringCloudServiceUpdate(d *schema.ResourceData, meta interface{
 					GitProperty: gitProperty,
 				},
 			},
+			Trace: expandArmSpringCloudTrace(d.Get("trace").([]interface{})),
+		},
+		Sku: &appplatform.Sku{
+			Name: utils.String(d.Get("sku_name").(string)),
 		},
 		Tags: tags.Expand(d.Get("tags").(map[string]interface{})),
 	}
@@ -283,11 +318,18 @@ func resourceArmSpringCloudServiceRead(d *schema.ResourceData, meta interface{})
 	if location := resp.Location; location != nil {
 		d.Set("location", azure.NormalizeLocation(*location))
 	}
-
-	if resp.Properties != nil && resp.Properties.ConfigServerProperties != nil && resp.Properties.ConfigServerProperties.ConfigServer != nil {
-		if props := resp.Properties.ConfigServerProperties.ConfigServer.GitProperty; props != nil {
-			if err := d.Set("config_server_git_setting", flattenArmSpringCloudConfigServerGitProperty(props, d)); err != nil {
-				return fmt.Errorf("failure setting AzureRM Spring Cloud Service error: %+v", err)
+	if resp.Sku != nil {
+		d.Set("sku_name", resp.Sku.Name)
+	}
+	if resp.Properties != nil {
+		if err := d.Set("trace", flattenArmSpringCloudTrace(resp.Properties.Trace)); err != nil {
+			return fmt.Errorf("failure setting `trace`: %+v", err)
+		}
+		if resp.Properties.ConfigServerProperties != nil && resp.Properties.ConfigServerProperties.ConfigServer != nil {
+			if props := resp.Properties.ConfigServerProperties.ConfigServer.GitProperty; props != nil {
+				if err := d.Set("config_server_git_setting", flattenArmSpringCloudConfigServerGitProperty(props, d)); err != nil {
+					return fmt.Errorf("failure setting AzureRM Spring Cloud Service error: %+v", err)
+				}
 			}
 		}
 	}
@@ -422,6 +464,19 @@ func expandArmSpringCloudGitPatternRepository(input []interface{}) (*[]appplatfo
 	return &results, nil
 }
 
+func expandArmSpringCloudTrace(input []interface{}) *appplatform.TraceProperties {
+	if len(input) == 0 || input[0] == nil {
+		return &appplatform.TraceProperties{
+			Enabled: utils.Bool(false),
+		}
+	}
+	v := input[0].(map[string]interface{})
+	return &appplatform.TraceProperties{
+		Enabled:                      utils.Bool(true),
+		AppInsightInstrumentationKey: utils.String(v["instrumentation_key"].(string)),
+	}
+}
+
 func flattenArmSpringCloudConfigServerGitProperty(input *appplatform.ConfigServerGitProperty, d *schema.ResourceData) []interface{} {
 	if input == nil {
 		return []interface{}{}
@@ -618,3 +673,28 @@ func flattenArmSpringCloudGitPatternRepository(input *[]appplatform.GitPatternRe
 
 	return results
 }
+
+func flattenArmSpringCloudTrace(input *appplatform.TraceProperties) []interface{} {
+	if input == nil {
+		return []interface{}{}
+	}
+
+	enabled := false
+	instrumentationKey := ""
+	if input.Enabled != nil {
+		enabled = *input.Enabled
+	}
+	if input.AppInsightInstrumentationKey != nil {
+		instrumentationKey = *input.AppInsightInstrumentationKey
+	}
+
+	if !enabled {
+		return []interface{}{}
+	}
+
+	return []interface{}{
+		map[string]interface{}{
+			"instrumentation_key": instrumentationKey,
+		},
+	}
+}

azurerm/internal/services/appplatform/tests/spring_cloud_service_resource_test.go

@@ -197,6 +197,13 @@ resource "azurerm_resource_group" "test" {
   location = "%s"
 }
 
+resource "azurerm_application_insights" "test" {
+  name                = "acctestai-%d"
+  location            = azurerm_resource_group.test.location
+  resource_group_name = azurerm_resource_group.test.name
+  application_type    = "web"
+}
+
 resource "azurerm_spring_cloud_service" "test" {
   name                = "acctest-sc-%d"
   location            = azurerm_resource_group.test.location
@@ -233,12 +240,16 @@ resource "azurerm_spring_cloud_service" "test" {
     }
   }
 
+  trace {
+    instrumentation_key = azurerm_application_insights.test.instrumentation_key
+  }
+
   tags = {
     Env     = "Test"
     version = "1"
   }
 }
-`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
+`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
 }
 
 func testAccAzureRMSpringCloudService_requiresImport(data acceptance.TestData) string {

website/docs/r/spring_cloud_service.html.markdown

@@ -22,17 +22,29 @@ resource "azurerm_resource_group" "example" {
   location = "Southeast Asia"
 }
 
+resource "azurerm_application_insights" "example" {
+  name                = "tf-test-appinsights"
+  location            = azurerm_resource_group.example.location
+  resource_group_name = azurerm_resource_group.example.name
+  application_type    = "web"
+}
+
 resource "azurerm_spring_cloud_service" "example" {
   name                = "example-springcloud"
   resource_group_name = azurerm_resource_group.example.name
   location            = azurerm_resource_group.example.location
+  sku_name            = "S0"
 
   config_server_git_setting {
     uri          = "https://github.com/Azure-Samples/piggymetrics"
     label        = "config"
     search_paths = ["dir1", "dir2"]
   }
 
+  trace {
+    instrumentation_key = azurerm_application_insights.example.instrumentation_key
+  }
+
   tags = {
     Env = "staging"
   }
@@ -51,8 +63,12 @@ The following arguments are supported:
 
 -> **Note:** At this time Azure Spring Cloud Service is only supported in a subset of regions (including `East US`, `South East Asia`, `West Europe` and `West US 2`.
 
+* `sku_name` - (Optional) Specifies the SKU Name for this Spring Cloud Service. Possible values are `B0` and `S0`. Defaults to `S0`.
+
 * `config_server_git_setting` - (Optional) A `config_server_git_setting` block as defined below.
 
+* `trace` - (Optional) A `trace` block as defined below.
+
 * `tags` - (Optional) A mapping of tags to assign to the resource.
 
 ---
@@ -109,6 +125,12 @@ The `ssh_auth` block supports the following:
 
 * `strict_host_key_checking_enabled` - (Optional) Indicates whether the Config Server instance will fail to start if the host_key does not match.
 
+---
+
+The `trace` block supports the following:
+
+* `instrumentation_key` - (Required) The Instrumentation Key used for Application Insights.
+
 ## Attributes Reference
 
 The following attributes are exported: