fix(region): create disk with tags

Author: ioito

pkg/cloudprovider/disk.go

@@ -21,6 +21,8 @@ type DiskCreateConfig struct {
 	Iops       int
 	Throughput int
 	ProjectId  string
+	SnapshotId string
+	ImageId    string
 
 	Tags map[string]string
 }

pkg/multicloud/aliyun/disk.go

@@ -271,12 +271,12 @@ func (self *SDisk) GetMountpoint() string {
 	return ""
 }
 
-func (self *SRegion) CreateDisk(zoneId string, category string, name string, sizeGb int, desc string, projectId string) (string, error) {
+func (self *SRegion) CreateDisk(zoneId string, category string, opts *cloudprovider.DiskCreateConfig) (string, error) {
 	params := make(map[string]string)
 	params["ZoneId"] = zoneId
-	params["DiskName"] = name
-	if len(desc) > 0 {
-		params["Description"] = desc
+	params["DiskName"] = opts.Name
+	if len(opts.Desc) > 0 {
+		params["Description"] = opts.Desc
 	}
 	params["Encrypted"] = "false"
 	params["DiskCategory"] = category
@@ -296,10 +296,18 @@ func (self *SRegion) CreateDisk(zoneId string, category string, name string, siz
 		params["BurstingEnabled"] = "true"
 	}
 
-	if len(projectId) > 0 {
-		params["ResourceGroupId"] = projectId
+	if len(opts.ProjectId) > 0 {
+		params["ResourceGroupId"] = opts.ProjectId
 	}
-	params["Size"] = fmt.Sprintf("%d", sizeGb)
+
+	tagIdx := 1
+	for k, v := range opts.Tags {
+		params[fmt.Sprintf("Tag.%d.Key", tagIdx)] = k
+		params[fmt.Sprintf("Tag.%d.Value", tagIdx)] = v
+		tagIdx += 1
+	}
+
+	params["Size"] = fmt.Sprintf("%d", opts.SizeGb)
 	params["ClientToken"] = utils.GenRequestId(20)
 
 	body, err := self.ecsRequest("CreateDisk", params)

pkg/multicloud/aliyun/storage.go

@@ -142,8 +142,8 @@ func (self *SStorage) GetIStoragecache() cloudprovider.ICloudStoragecache {
 	return self.zone.region.getStoragecache()
 }
 
-func (self *SStorage) CreateIDisk(conf *cloudprovider.DiskCreateConfig) (cloudprovider.ICloudDisk, error) {
-	diskId, err := self.zone.region.CreateDisk(self.zone.ZoneId, self.storageType, conf.Name, conf.SizeGb, conf.Desc, conf.ProjectId)
+func (self *SStorage) CreateIDisk(opts *cloudprovider.DiskCreateConfig) (cloudprovider.ICloudDisk, error) {
+	diskId, err := self.zone.region.CreateDisk(self.zone.ZoneId, self.storageType, opts)
 	if err != nil {
 		return nil, errors.Wrapf(err, "CreateDisk")
 	}

pkg/multicloud/aws/disk.go

@@ -240,7 +240,14 @@ func (self *SDisk) Reset(ctx context.Context, snapshotId string) (string, error)
 	if self.State != "available" {
 		return "", errors.Wrapf(cloudprovider.ErrInvalidStatus, "invalid status %s", self.State)
 	}
-	disk, err := self.storage.zone.region.CreateDisk(self.AvailabilityZone, self.VolumeType, self.GetName(), self.GetDiskSizeMB()/1024, self.Iops, self.Throughput, snapshotId, self.GetDescription())
+	opts := &cloudprovider.DiskCreateConfig{
+		Name:       self.GetName(),
+		SizeGb:     self.GetDiskSizeMB() / 1024,
+		Iops:       self.Iops,
+		Throughput: self.Throughput,
+		SnapshotId: snapshotId,
+	}
+	disk, err := self.storage.zone.region.CreateDisk(self.AvailabilityZone, self.VolumeType, opts)
 	if err != nil {
 		return "", errors.Wrapf(err, "CreateDisk")
 	}
@@ -353,41 +360,47 @@ func GenDiskIops(diskType string, sizeGB int) int64 {
 	return 0
 }
 
-func (self *SRegion) CreateDisk(zoneId string, volumeType string, name string, sizeGb, iops, throughput int, snapshotId string, desc string) (*SDisk, error) {
+func (self *SRegion) CreateDisk(zoneId string, volumeType string, opts *cloudprovider.DiskCreateConfig) (*SDisk, error) {
 	params := map[string]string{
 		"AvailabilityZone": zoneId,
 		"ClientToken":      utils.GenRequestId(20),
-		"Size":             fmt.Sprintf("%d", sizeGb),
+		"Size":             fmt.Sprintf("%d", opts.SizeGb),
 		"VolumeType":       volumeType,
 	}
 	tagIdx := 1
-	if len(name) > 0 {
-		params[fmt.Sprintf("TagSpecification.%d.ResourceType", tagIdx)] = "volume"
-		params[fmt.Sprintf("TagSpecification.%d.Tag.1.Key", tagIdx)] = "Name"
-		params[fmt.Sprintf("TagSpecification.%d.Tag.1.Value", tagIdx)] = name
-		if len(desc) > 0 {
-			params[fmt.Sprintf("TagSpecification.%d.Tag.2.Key", tagIdx)] = "Description"
-			params[fmt.Sprintf("TagSpecification.%d.Tag.2.Value", tagIdx)] = desc
+	if len(opts.Name) > 0 {
+		params["TagSpecification.1.ResourceType"] = "volume"
+		params[fmt.Sprintf("TagSpecification.1.Tag.%d.Key", tagIdx)] = "Name"
+		params[fmt.Sprintf("TagSpecification.1.Tag.%d.Value", tagIdx)] = opts.Name
+		tagIdx++
+		if len(opts.Desc) > 0 {
+			params[fmt.Sprintf("TagSpecification.1.Tag.%d.Key", tagIdx)] = "Description"
+			params[fmt.Sprintf("TagSpecification.1.Tag.%d.Value", tagIdx)] = opts.Desc
 		}
+	}
+	for k, v := range opts.Tags {
+		params["TagSpecification.1.ResourceType"] = "volume"
+		params[fmt.Sprintf("TagSpecification.1.Tag.%d.Key", tagIdx)] = k
+		params[fmt.Sprintf("TagSpecification.1.Tag.%d.Value", tagIdx)] = v
 		tagIdx++
 	}
-	if len(snapshotId) > 0 {
-		params["SnapshotId"] = snapshotId
+	if len(opts.SnapshotId) > 0 {
+		params["SnapshotId"] = opts.SnapshotId
 	}
-	if throughput >= 125 && throughput <= 1000 && volumeType == api.STORAGE_GP3_SSD {
-		params["Throughput"] = fmt.Sprintf("%d", throughput)
+	if opts.Throughput >= 125 && opts.Throughput <= 1000 && volumeType == api.STORAGE_GP3_SSD {
+		params["Throughput"] = fmt.Sprintf("%d", opts.Throughput)
 	}
 
-	if iops == 0 {
-		iops = int(GenDiskIops(volumeType, sizeGb))
+	if opts.Iops == 0 {
+		opts.Iops = int(GenDiskIops(volumeType, opts.SizeGb))
 	}
 
 	if utils.IsInStringArray(volumeType, []string{
 		api.STORAGE_IO1_SSD,
 		api.STORAGE_IO2_SSD,
 		api.STORAGE_GP3_SSD,
 	}) {
-		params["Iops"] = fmt.Sprintf("%d", iops)
+		params["Iops"] = fmt.Sprintf("%d", opts.Iops)
 	}
 	ret := &SDisk{}
 	return ret, self.ec2Request("CreateVolume", params, ret)

pkg/multicloud/aws/shell/disk.go

@@ -17,6 +17,7 @@ package shell
 import (
 	"yunion.io/x/pkg/util/shellutils"
 
+	"yunion.io/x/cloudmux/pkg/cloudprovider"
 	"yunion.io/x/cloudmux/pkg/multicloud/aws"
 )
 
@@ -71,7 +72,15 @@ func init() {
 	}
 
 	shellutils.R(&VolumeCreateOptions{}, "disk-create", "create a volume", func(cli *aws.SRegion, args *VolumeCreateOptions) error {
-		volume, err := cli.CreateDisk(args.ZoneId, args.VolumeType, args.Name, args.SizeGb, args.Iops, args.Throughput, args.SnapshotId, args.Desc)
+		opts := &cloudprovider.DiskCreateConfig{
+			Name:       args.Name,
+			SizeGb:     args.SizeGb,
+			Iops:       args.Iops,
+			Throughput: args.Throughput,
+			SnapshotId: args.SnapshotId,
+			Desc:       args.Desc,
+		}
+		volume, err := cli.CreateDisk(args.ZoneId, args.VolumeType, opts)
 		if err != nil {
 			return err
 		}

pkg/multicloud/aws/storage.go

@@ -119,8 +119,8 @@ func (self *SStorage) GetEnabled() bool {
 	return true
 }
 
-func (self *SStorage) CreateIDisk(conf *cloudprovider.DiskCreateConfig) (cloudprovider.ICloudDisk, error) {
-	disk, err := self.zone.region.CreateDisk(self.zone.ZoneName, self.storageType, conf.Name, conf.SizeGb, conf.Iops, conf.Throughput, "", conf.Desc)
+func (self *SStorage) CreateIDisk(opts *cloudprovider.DiskCreateConfig) (cloudprovider.ICloudDisk, error) {
+	disk, err := self.zone.region.CreateDisk(self.zone.ZoneName, self.storageType, opts)
 	if err != nil {
 		return nil, errors.Wrap(err, "CreateDisk")
 	}

pkg/multicloud/azure/disk.go

@@ -82,9 +82,9 @@ type SDisk struct {
 	Properties DiskProperties `json:"properties,omitempty"`
 }
 
-func (self *SRegion) CreateDisk(storageType string, name string, sizeGb int32, imageId, snapshotId, resourceGroup string) (*SDisk, error) {
+func (self *SRegion) CreateDisk(storageType string, opts *cloudprovider.DiskCreateConfig) (*SDisk, error) {
 	params := jsonutils.Marshal(map[string]interface{}{
-		"Name":     name,
+		"Name":     opts.Name,
 		"Location": self.Name,
 		"Sku": map[string]string{
 			"Name": storageType,
@@ -95,12 +95,12 @@ func (self *SRegion) CreateDisk(storageType string, name string, sizeGb int32, i
 		"CreationData": map[string]string{
 			"CreateOption": "Empty",
 		},
-		"DiskSizeGB": sizeGb,
+		"DiskSizeGB": opts.SizeGb,
 	}
-	if len(imageId) > 0 {
-		image, err := self.GetImageById(imageId)
+	if len(opts.ImageId) > 0 {
+		image, err := self.GetImageById(opts.ImageId)
 		if err != nil {
-			return nil, errors.Wrapf(err, "GetImageById(%s)", imageId)
+			return nil, errors.Wrapf(err, "GetImageById(%s)", opts.ImageId)
 		}
 		// 通过镜像创建的磁盘只能传ID参数，不能通过sku,offer等参数创建.
 		imageId, err := self.getOfferedImageId(&image)
@@ -115,17 +115,17 @@ func (self *SRegion) CreateDisk(storageType string, name string, sizeGb int32, i
 				},
 			},
 		}
-	} else if len(snapshotId) > 0 {
+	} else if len(opts.SnapshotId) > 0 {
 		properties = map[string]interface{}{
 			"CreationData": map[string]interface{}{
 				"CreateOption":     "Copy",
-				"sourceResourceId": snapshotId,
+				"sourceResourceId": opts.SnapshotId,
 			},
 		}
 	}
 	params.Add(jsonutils.Marshal(properties), "Properties")
 	disk := &SDisk{}
-	return disk, self.create(resourceGroup, params, disk)
+	return disk, self.create(opts.ProjectId, params, disk)
 }
 
 func (self *SRegion) DeleteDisk(diskId string) error {
@@ -312,7 +312,13 @@ func (self *SDisk) Reset(ctx context.Context, snapshotId string) (string, error)
 	if self.Properties.DiskState != "Unattached" {
 		return "", fmt.Errorf("Azure reset disk needs to be done in the Unattached state, current status: %s", self.Properties.DiskState)
 	}
-	disk, err := self.storage.zone.region.CreateDisk(self.Sku.Name, self.Name, 0, "", snapshotId, self.GetProjectId())
+	opts := &cloudprovider.DiskCreateConfig{
+		Name:       self.Name,
+		SizeGb:     0,
+		SnapshotId: snapshotId,
+		ProjectId:  self.GetProjectId(),
+	}
+	disk, err := self.storage.zone.region.CreateDisk(self.Sku.Name, opts)
 	if err != nil {
 		return "", errors.Wrap(err, "CreateDisk")
 	}

pkg/multicloud/azure/shell/disk.go

@@ -17,6 +17,7 @@ package shell
 import (
 	"yunion.io/x/pkg/util/shellutils"
 
+	"yunion.io/x/cloudmux/pkg/cloudprovider"
 	"yunion.io/x/cloudmux/pkg/multicloud/azure"
 )
 
@@ -35,14 +36,21 @@ func init() {
 	type DiskCreateOptions struct {
 		NAME          string `help:"Disk name"`
 		STORAGETYPE   string `help:"Storage type" choices:"Standard_LRS|Premium_LRS|StandardSSD_LRS"`
-		SizeGb        int32  `help:"Disk size"`
+		SizeGb        int    `help:"Disk size"`
 		Image         string `help:"Image id"`
 		SnapshotId    string `help:"Create disk by snapshot"`
 		ResourceGroup string `help:"ResourceGroup Name"`
 	}
 
 	shellutils.R(&DiskCreateOptions{}, "disk-create", "Create disk", func(cli *azure.SRegion, args *DiskCreateOptions) error {
-		disk, err := cli.CreateDisk(args.STORAGETYPE, args.NAME, args.SizeGb, args.Image, args.SnapshotId, args.ResourceGroup)
+		opts := &cloudprovider.DiskCreateConfig{
+			Name:       args.NAME,
+			SizeGb:     args.SizeGb,
+			ImageId:    args.Image,
+			SnapshotId: args.SnapshotId,
+			ProjectId:  args.ResourceGroup,
+		}
+		disk, err := cli.CreateDisk(args.STORAGETYPE, opts)
 		if err != nil {
 			return err
 		}

pkg/multicloud/azure/storage.go

@@ -83,8 +83,8 @@ func (self *SStorage) GetCapacityUsedMB() int64 {
 	return 0
 }
 
-func (self *SStorage) CreateIDisk(conf *cloudprovider.DiskCreateConfig) (cloudprovider.ICloudDisk, error) {
-	disk, err := self.zone.region.CreateDisk(self.storageType, conf.Name, int32(conf.SizeGb), "", "", conf.ProjectId)
+func (self *SStorage) CreateIDisk(opts *cloudprovider.DiskCreateConfig) (cloudprovider.ICloudDisk, error) {
+	disk, err := self.zone.region.CreateDisk(self.storageType, opts)
 	if err != nil {
 		return nil, err
 	}

pkg/multicloud/google/disk.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/encode"
 
 	billing "yunion.io/x/cloudmux/pkg/apis/billing"
 	api "yunion.io/x/cloudmux/pkg/apis/compute"
@@ -219,20 +220,25 @@ func (disk *SDisk) GetProjectId() string {
 	return disk.storage.zone.region.GetProjectId()
 }
 
-func (region *SRegion) CreateDisk(name string, sizeGb int, zone string, storageType string, image string, desc string) (*SDisk, error) {
+func (region *SRegion) CreateDisk(zone string, storageType string, opts *cloudprovider.DiskCreateConfig) (*SDisk, error) {
 	if !strings.HasPrefix(storageType, GOOGLE_COMPUTE_DOMAIN) {
 		storageType = fmt.Sprintf("projects/%s/zones/%s/diskTypes/%s", region.GetProjectId(), zone, storageType)
 	}
+	labels := map[string]string{}
+	for k, v := range opts.Tags {
+		labels[encode.EncodeGoogleLabel(k)] = encode.EncodeGoogleLabel(v)
+	}
 	body := map[string]interface{}{
-		"name":        name,
-		"description": desc,
+		"name":        opts.Name,
+		"description": opts.Desc,
 		// https://www.googleapis.com/compute/v1/projects/my-project-15390453537169/zones/us-west2-c/diskTypes/pd-standard
 		// projects/my-project-15390453537169/zones/us-west2-c/diskTypes/pd-standard
-		"type": storageType,
+		"type":   storageType,
+		"labels": labels,
 	}
-	body["sizeGb"] = sizeGb
-	if len(image) > 0 {
-		body["sourceImage"] = image
+	body["sizeGb"] = opts.SizeGb
+	if len(opts.ImageId) > 0 {
+		body["sourceImage"] = opts.ImageId
 	}
 	disk := &SDisk{}
 	resource := fmt.Sprintf("zones/%s/disks", zone)