Merge pull request #8986 from vijayrajah/feature/datadisk-change_name

datadisk name change
2020-04-07 11:06:35 -07:00 · 2020-04-07 11:06:35 -07:00 · 07be1a0a30
parent 559a53184d 90a0c5ec49
commit 07be1a0a30
27 changed files with 89 additions and 16 deletions
--- a/builder/azure/arm/config.go
+++ b/builder/azure/arm/config.go
@ -394,6 +394,7 @@ type Config struct {
 	tmpDeploymentName      string
 	tmpKeyVaultName        string
 	tmpOSDiskName          string
+	tmpDataDiskName        string
 	tmpSubnetName          string
 	tmpVirtualNetworkName  string
 	tmpNsgName             string
@ -650,6 +651,7 @@ func setRuntimeValues(c *Config) {
 	c.tmpNicName = tempName.NicName
 	c.tmpPublicIPAddressName = tempName.PublicIPAddressName
 	c.tmpOSDiskName = tempName.OSDiskName
+	c.tmpDataDiskName = tempName.DataDiskname
 	c.tmpSubnetName = tempName.SubnetName
 	c.tmpVirtualNetworkName = tempName.VirtualNetworkName
 	c.tmpNsgName = tempName.NsgName
--- a/builder/azure/arm/template_factory.go
+++ b/builder/azure/arm/template_factory.go
@ -37,6 +37,7 @@ func GetVirtualMachineDeployment(config *Config) (*resources.Deployment, error)
 		DnsNameForPublicIP:         &template.TemplateParameter{Value: config.tmpComputeName},
 		NicName:                    &template.TemplateParameter{Value: config.tmpNicName},
 		OSDiskName:                 &template.TemplateParameter{Value: config.tmpOSDiskName},
+		DataDiskName:               &template.TemplateParameter{Value: config.tmpDataDiskName},
 		PublicIPAddressName:        &template.TemplateParameter{Value: config.tmpPublicIPAddressName},
 		SubnetName:                 &template.TemplateParameter{Value: config.tmpSubnetName},
 		StorageAccountBlobEndpoint: &template.TemplateParameter{Value: config.storageAccountBlobEndpoint},
@ -96,7 +97,7 @@ func GetVirtualMachineDeployment(config *Config) (*resources.Deployment, error)

 	if len(config.AdditionalDiskSize) > 0 {
 		isManaged := config.CustomManagedImageName != "" || (config.ManagedImageName != "" && config.ImagePublisher != "") || config.SharedGallery.Subscription != ""
-		builder.SetAdditionalDisks(config.AdditionalDiskSize, isManaged, config.diskCachingType)
+		builder.SetAdditionalDisks(config.AdditionalDiskSize, config.tmpDataDiskName, isManaged, config.diskCachingType)
 	}

 	if config.customData != "" {
--- a/builder/azure/arm/template_factory_test.TestPlanInfo01.approved.json
+++ b/builder/azure/arm/template_factory_test.TestPlanInfo01.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/template_factory_test.TestPlanInfo02.approved.json
+++ b/builder/azure/arm/template_factory_test.TestPlanInfo02.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment03.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment03.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment04.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment04.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment05.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment05.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment06.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment06.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment07.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment07.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment08.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment08.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment09.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment09.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment10.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment10.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment11.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment11.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
@ -144,9 +147,9 @@
              "createOption": "Empty",
              "diskSizeGB": 32,
              "lun": 0,
-              "name": "datadisk-1",
+              "name": "[concat(parameters('dataDiskName'),'-1')]",
              "vhd": {
-                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '1','.vhd')]"
+                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-1','.vhd')]"
              }
            }
          ],
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment12.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment12.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
@ -147,7 +150,7 @@
              "managedDisk": {
                "storageAccountType": "Standard_LRS"
              },
-              "name": "datadisk-1"
+              "name": "[concat(parameters('dataDiskName'),'-1')]"
            }
          ],
          "imageReference": {
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment13.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment13.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/arm/tempname.go
+++ b/builder/azure/arm/tempname.go
@ -15,6 +15,7 @@ type TempName struct {
 	KeyVaultName        string
 	ResourceGroupName   string
 	OSDiskName          string
+	DataDiskname        string
 	NicName             string
 	SubnetName          string
 	PublicIPAddressName string
@ -30,6 +31,7 @@ func NewTempName() *TempName {
 	tempName.DeploymentName = fmt.Sprintf("pkrdp%s", suffix)
 	tempName.KeyVaultName = fmt.Sprintf("pkrkv%s", suffix)
 	tempName.OSDiskName = fmt.Sprintf("pkros%s", suffix)
+	tempName.DataDiskname = fmt.Sprintf("pkrdd%s", suffix)
 	tempName.NicName = fmt.Sprintf("pkrni%s", suffix)
 	tempName.PublicIPAddressName = fmt.Sprintf("pkrip%s", suffix)
 	tempName.SubnetName = fmt.Sprintf("pkrsn%s", suffix)
--- a/builder/azure/common/template/template_builder.go
+++ b/builder/azure/common/template/template_builder.go
@ -231,7 +231,7 @@ func (s *TemplateBuilder) SetOSDiskSizeGB(diskSizeGB int32) error {
 	return nil
 }

-func (s *TemplateBuilder) SetAdditionalDisks(diskSizeGB []int32, isManaged bool, cachingType compute.CachingTypes) error {
+func (s *TemplateBuilder) SetAdditionalDisks(diskSizeGB []int32, dataDiskname string, isManaged bool, cachingType compute.CachingTypes) error {
 	resource, err := s.getResourceByType(resourceVirtualMachine)
 	if err != nil {
 		return err
@ -243,7 +243,8 @@ func (s *TemplateBuilder) SetAdditionalDisks(diskSizeGB []int32, isManaged bool,
 	for i, additionalSize := range diskSizeGB {
 		dataDisks[i].DiskSizeGB = to.Int32Ptr(additionalSize)
 		dataDisks[i].Lun = to.IntPtr(i)
-		dataDisks[i].Name = to.StringPtr(fmt.Sprintf("datadisk-%d", i+1))
+		// dataDisks[i].Name = to.StringPtr(fmt.Sprintf("%s-%d", dataDiskname, i+1))
+		dataDisks[i].Name = to.StringPtr(fmt.Sprintf("[concat(parameters('dataDiskName'),'-%d')]", i+1))
 		dataDisks[i].CreateOption = "Empty"
 		dataDisks[i].Caching = cachingType
 		if isManaged {
@ -251,7 +252,7 @@ func (s *TemplateBuilder) SetAdditionalDisks(diskSizeGB []int32, isManaged bool,
 			dataDisks[i].ManagedDisk = profile.OsDisk.ManagedDisk
 		} else {
 			dataDisks[i].Vhd = &compute.VirtualHardDisk{
-				URI: to.StringPtr(fmt.Sprintf("[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '%d','.vhd')]", i+1)),
+				URI: to.StringPtr(fmt.Sprintf("[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-%d','.vhd')]", i+1)),
 			}
 			dataDisks[i].ManagedDisk = nil
 		}
@ -581,7 +582,10 @@ const BasicTemplate = `{
    },
    "vmName": {
      "type": "string"
-    }
+	},
+	"dataDiskName": {
+		"type": "string"
+	}
  },
  "variables": {
    "addressPrefix": "10.0.0.0/16",
--- a/builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/common/template/template_builder_test.TestBuildWindows01.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildWindows01.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
@ -161,7 +164,7 @@
              "managedDisk": {
                "storageAccountType": "Premium_LRS"
              },
-              "name": "datadisk-1"
+              "name": "[concat(parameters('dataDiskName'),'-1')]"
            },
            {
              "caching": "ReadWrite",
@ -171,7 +174,7 @@
              "managedDisk": {
                "storageAccountType": "Premium_LRS"
              },
-              "name": "datadisk-2"
+              "name": "[concat(parameters('dataDiskName'),'-2')]"
            }
          ],
          "imageReference": {
--- a/builder/azure/common/template/template_builder_test.TestBuildWindows02.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildWindows02.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
@ -158,9 +161,9 @@
              "createOption": "Empty",
              "diskSizeGB": 32,
              "lun": 0,
-              "name": "datadisk-1",
+              "name": "[concat(parameters('dataDiskName'),'-1')]",
              "vhd": {
-                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '1','.vhd')]"
+                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-1','.vhd')]"
              }
            },
            {
@ -168,9 +171,9 @@
              "createOption": "Empty",
              "diskSizeGB": 64,
              "lun": 1,
-              "name": "datadisk-2",
+              "name": "[concat(parameters('dataDiskName'),'-2')]",
              "vhd": {
-                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '2','.vhd')]"
+                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-2','.vhd')]"
              }
            }
          ],
--- a/builder/azure/common/template/template_builder_test.TestNetworkSecurityGroup00.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestNetworkSecurityGroup00.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/common/template/template_builder_test.TestSharedImageGallery00.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestSharedImageGallery00.approved.json
@ -8,6 +8,9 @@
    "adminUsername": {
      "type": "string"
    },
+    "dataDiskName": {
+      "type": "string"
+    },
    "dnsNameForPublicIP": {
      "type": "string"
    },
--- a/builder/azure/common/template/template_builder_test.go
+++ b/builder/azure/common/template/template_builder_test.go
@ -138,7 +138,7 @@ func TestBuildWindows01(t *testing.T) {
 		t.Fatal(err)
 	}

-	err = testSubject.SetAdditionalDisks([]int32{32, 64}, true, compute.CachingTypesReadWrite)
+	err = testSubject.SetAdditionalDisks([]int32{32, 64}, "datadisk", true, compute.CachingTypesReadWrite)
 	if err != nil {
 		t.Fatal(err)
 	}
@ -166,7 +166,7 @@ func TestBuildWindows02(t *testing.T) {
 		t.Fatal(err)
 	}

-	err = testSubject.SetAdditionalDisks([]int32{32, 64}, false, compute.CachingTypesReadWrite)
+	err = testSubject.SetAdditionalDisks([]int32{32, 64}, "datadisk", false, compute.CachingTypesReadWrite)
 	if err != nil {
 		t.Fatal(err)
 	}
--- a/builder/azure/common/template/template_parameters.go
+++ b/builder/azure/common/template/template_parameters.go
@ -27,6 +27,7 @@ type TemplateParameters struct {
 	ObjectId                   *TemplateParameter `json:"objectId,omitempty"`
 	NicName                    *TemplateParameter `json:"nicName,omitempty"`
 	OSDiskName                 *TemplateParameter `json:"osDiskName,omitempty"`
+	DataDiskName               *TemplateParameter `json:"dataDiskName,omitempty"`
 	PublicIPAddressName        *TemplateParameter `json:"publicIPAddressName,omitempty"`
 	StorageAccountBlobEndpoint *TemplateParameter `json:"storageAccountBlobEndpoint,omitempty"`
 	SubnetName                 *TemplateParameter `json:"subnetName,omitempty"`