azurerm_service_fabric_cluster - support for specifying the cluster code version

azurerm/resource_arm_service_fabric_cluster.go

@@ -53,6 +53,12 @@ func resourceArmServiceFabricCluster() *schema.Resource {
 				}, false),
 			},
 
+			"cluster_code_version": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.NoZeroValues,
+			},
+
 			"management_endpoint": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -97,7 +103,7 @@ func resourceArmServiceFabricCluster() *schema.Resource {
 			"client_certificate_thumbprint": {
 				Type:     schema.TypeList,
 				Optional: true,
-				MaxItems: 1,
+				MaxItems: 2,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"thumbprint": {
@@ -275,6 +281,7 @@ func resourceArmServiceFabricClusterCreate(d *schema.ResourceData, meta interfac
 	reliabilityLevel := d.Get("reliability_level").(string)
 	managementEndpoint := d.Get("management_endpoint").(string)
 	upgradeMode := d.Get("upgrade_mode").(string)
+	clusterCodeVersion := d.Get("cluster_code_version").(string)
 	vmImage := d.Get("vm_image").(string)
 	tags := d.Get("tags").(map[string]interface{})
 
@@ -313,6 +320,10 @@ func resourceArmServiceFabricClusterCreate(d *schema.ResourceData, meta interfac
 		},
 	}
 
+	if clusterCodeVersion != "" {
+		cluster.ClusterProperties.ClusterCodeVersion = utils.String(clusterCodeVersion)
+	}
+
 	future, err := client.Create(ctx, resourceGroup, name, cluster)
 	if err != nil {
 		return fmt.Errorf("Error creating Service Fabric Cluster %q (Resource Group %q): %+v", name, resourceGroup, err)
@@ -346,6 +357,7 @@ func resourceArmServiceFabricClusterUpdate(d *schema.ResourceData, meta interfac
 	name := d.Get("name").(string)
 	reliabilityLevel := d.Get("reliability_level").(string)
 	upgradeMode := d.Get("upgrade_mode").(string)
+	clusterCodeVersion := d.Get("cluster_code_version").(string)
 	tags := d.Get("tags").(map[string]interface{})
 
 	addOnFeaturesRaw := d.Get("add_on_features").(*schema.Set).List()
@@ -376,6 +388,10 @@ func resourceArmServiceFabricClusterUpdate(d *schema.ResourceData, meta interfac
 		Tags: expandTags(tags),
 	}
 
+	if clusterCodeVersion != "" {
+		parameters.ClusterPropertiesUpdateParameters.ClusterCodeVersion = utils.String(clusterCodeVersion)
+	}
+
 	future, err := client.Update(ctx, resourceGroup, name, parameters)
 	if err != nil {
 		return fmt.Errorf("Error updating Service Fabric Cluster %q (Resource Group %q): %+v", name, resourceGroup, err)
@@ -422,9 +438,15 @@ func resourceArmServiceFabricClusterRead(d *schema.ResourceData, meta interface{
 		d.Set("cluster_endpoint", props.ClusterEndpoint)
 		d.Set("management_endpoint", props.ManagementEndpoint)
 		d.Set("reliability_level", string(props.ReliabilityLevel))
-		d.Set("upgrade_mode", string(props.UpgradeMode))
 		d.Set("vm_image", props.VMImage)
 
+		upgradeMode := string(props.UpgradeMode)
+		d.Set("upgrade_mode", upgradeMode)
+
+		if upgradeMode == "Manual" {
+			d.Set("cluster_code_version", props.ClusterCodeVersion)
+		}
+
 		addOnFeatures := flattenServiceFabricClusterAddOnFeatures(props.AddOnFeatures)
 		if err := d.Set("add_on_features", schema.NewSet(schema.HashString, addOnFeatures)); err != nil {
 			return fmt.Errorf("Error setting `add_on_features`: %+v", err)

azurerm/resource_arm_service_fabric_cluster_test.go

@@ -44,6 +44,41 @@ func TestAccAzureRMServiceFabricCluster_basic(t *testing.T) {
 	})
 }
 
+func TestAccAzureRMServiceFabricCluster_manualClusterCodeVersion(t *testing.T) {
+	resourceName := "azurerm_service_fabric_cluster.test"
+	ri := acctest.RandInt()
+	location := testLocation()
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMServiceFabricClusterDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAzureRMServiceFabricCluster_manualClusterCodeVersion(ri, location, "6.3.162.9494"),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMServiceFabricClusterExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "upgrade_mode", "Manual"),
+					resource.TestCheckResourceAttr(resourceName, "cluster_code_version", "6.3.162.9494"),
+				),
+			},
+			{
+				Config: testAccAzureRMServiceFabricCluster_manualClusterCodeVersion(ri, location, "6.3.176.9494"),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMServiceFabricClusterExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "upgrade_mode", "Manual"),
+					resource.TestCheckResourceAttr(resourceName, "cluster_code_version", "6.3.176.9494"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccAzureRMServiceFabricCluster_addOnFeatures(t *testing.T) {
 	resourceName := "azurerm_service_fabric_cluster.test"
 	ri := acctest.RandInt()
@@ -432,6 +467,34 @@ resource "azurerm_service_fabric_cluster" "test" {
 `, rInt, location, rInt, count)
 }
 
+func testAccAzureRMServiceFabricCluster_manualClusterCodeVersion(rInt int, location, clusterCodeVersion string) string {
+	return fmt.Sprintf(`
+resource "azurerm_resource_group" "test" {
+  name 		 = "acctestRG-%[1]d"
+  location = "%[2]s"
+}
+
+resource "azurerm_service_fabric_cluster" "test" {
+  name                 = "acctest-%[1]d"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  location             = "${azurerm_resource_group.test.location}"
+  reliability_level    = "Bronze"
+	upgrade_mode         = "Manual"
+	cluster_code_version = "%[3]s"
+  vm_image             = "Windows"
+  management_endpoint  = "http://example:80"
+
+  node_type {
+    name                 = "first"
+    instance_count       = 3
+    is_primary           = true
+    client_endpoint_port = 2020
+    http_endpoint_port   = 80
+  }
+}
+`, rInt, location, clusterCodeVersion)
+}
+
 func testAccAzureRMServiceFabricCluster_addOnFeatures(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {

website/docs/r/service_fabric_cluster.html.markdown

@@ -19,13 +19,14 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_service_fabric_cluster" "test" {
-  name                = "example-servicefabric"
-  resource_group_name = "${azurerm_resource_group.test.name}"
-  location            = "${azurerm_resource_group.test.location}"
-  reliability_level   = "Bronze"
-  upgrade_mode        = "Automatic"
-  vm_image            = "Windows"
-  management_endpoint = "https://example:80"
+  name                 = "example-servicefabric"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  location             = "${azurerm_resource_group.test.location}"
+  reliability_level    = "Bronze"
+  upgrade_mode         = "Manual"
+  cluster_code_version = "6.3.176.9494"
+  vm_image             = "Windows"
+  management_endpoint  = "https://example:80"
 
   node_type {
     name                 = "first"
@@ -60,6 +61,8 @@ The following arguments are supported:
 
 ---
 
+* `cluster_code_version` - (Optional) Required if Upgrade Mode set to `Manual`, Specifies the Version of the Cluster Code of the cluster.
+
 * `add_on_features` - (Optional) A List of one or more features which should be enabled, such as `DnsService`.
 
 * `certificate` - (Optional) A `certificate` block as defined below.