Support disk attach and detach operations to a machine (#98)

Signed-off-by: Deepak Mettem <[email protected]>

Author: dmettem

GNUmakefile

@@ -5,7 +5,7 @@ PKG_NAME=vra
 
 default: build
 
-build: fmtcheck
+build: fmtcheck lint
 	go install
 
 test: fmtcheck

examples/machine/main.tf

@@ -47,6 +47,18 @@ data "vra_network" "this" {
   name = var.network_name
 }
 
+resource "vra_block_device" "disk1" {
+  capacity_in_gb = 10
+  name = "terraform_vra_block_device1"
+  project_id = data.vra_project.this.id
+}
+
+resource "vra_block_device" "disk2" {
+  capacity_in_gb = 10
+  name = "terraform_vra_block_device2"
+  project_id = data.vra_project.this.id
+}
+
 resource "vra_machine" "this" {
   name        = "tf-machine"
   description = "terrafrom test machine"
@@ -85,4 +97,12 @@ EOF
     key   = "foo"
     value = "bar"
   }
+
+  disks {
+    block_device_id = vra_block_device.disk1.id
+  }
+
+  disks {
+    block_device_id = vra_block_device.disk2.id
+  }
 }

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
 	github.com/hashicorp/terraform-plugin-sdk v1.1.0
-	github.com/vmware/vra-sdk-go v0.2.1
+	github.com/vmware/vra-sdk-go v0.2.2
 )
 
 replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

go.sum

@@ -266,12 +266,8 @@ github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok=
 github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/vmihailenco/msgpack v3.3.3+incompatible h1:wapg9xDUZDzGCNFlwc5SqI1rvcciqcxEHac4CYj89xI=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
-github.com/vmware/vra-sdk-go v0.1.0 h1:Vp821drDulj4K7nwwiPqnGG51AX3B8NtNXZr5FN0zH4=
-github.com/vmware/vra-sdk-go v0.1.0/go.mod h1:dqUEePGPUHNYQ/p9DKZM1amqB2WP1uI9JkYvzF+auVo=
-github.com/vmware/vra-sdk-go v0.2.0 h1:HbS8C6zv9miMkAUVfnulzKDtJ/Q4naaqt0wpLzDk+fo=
-github.com/vmware/vra-sdk-go v0.2.0/go.mod h1:dqUEePGPUHNYQ/p9DKZM1amqB2WP1uI9JkYvzF+auVo=
-github.com/vmware/vra-sdk-go v0.2.1 h1:nDqlpc/E6O+PUEv7Y9SVckp9xaALwUdr9KkO9EvWRlU=
-github.com/vmware/vra-sdk-go v0.2.1/go.mod h1:dqUEePGPUHNYQ/p9DKZM1amqB2WP1uI9JkYvzF+auVo=
+github.com/vmware/vra-sdk-go v0.2.2 h1:Z6AuLOH8TAG2Ljg6nY25c1UcR3Li30SUG8QzAb8b4So=
+github.com/vmware/vra-sdk-go v0.2.2/go.mod h1:dqUEePGPUHNYQ/p9DKZM1amqB2WP1uI9JkYvzF+auVo=
 github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
 github.com/zclconf/go-cty v1.1.0 h1:uJwc9HiBOCpoKIObTQaLR+tsEXx1HBHnOsOOpcdhZgw=
 github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=

vra/data_source_deployment.go

@@ -110,11 +110,6 @@ func dataSourceDeployment() *schema.Resource {
 				Computed: true,
 			},
 			"resources": resourcesSchema(),
-			"simulated": &schema.Schema{
-				Type:     schema.TypeBool,
-				Optional: true,
-				Computed: true,
-			},
 			"status": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -154,7 +149,6 @@ func dataSourceDeploymentRead(d *schema.ResourceData, m interface{}) error {
 		d.Set("last_updated_by", deployment.LastUpdatedBy)
 		d.Set("lease_expire_at", deployment.LeaseExpireAt)
 		d.Set("project_id", deployment.ProjectID)
-		d.Set("simulated", deployment.Simulated)
 		d.Set("status", deployment.Status)
 
 		if err := d.Set("project", flattenResourceReference(deployment.Project)); err != nil {

vra/resource_deployment.go

@@ -106,10 +106,6 @@ func resourceDeployment() *schema.Resource {
 			},
 			"resources": resourcesSchema(),
 			// TODO: Add plan / simulate feature
-			"simulated": {
-				Type:     schema.TypeBool,
-				Computed: true,
-			},
 			"status": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -335,7 +331,6 @@ func resourceDeploymentRead(d *schema.ResourceData, m interface{}) error {
 	d.Set("last_updated_by", deployment.LastUpdatedBy)
 	d.Set("lease_expire_at", deployment.LeaseExpireAt)
 	d.Set("project_id", deployment.ProjectID)
-	d.Set("simulated", deployment.Simulated)
 	d.Set("status", deployment.Status)
 
 	if err := d.Set("project", flattenResourceReference(deployment.Project)); err != nil {

vra/resource_flavor_profile.go

@@ -104,13 +104,11 @@ func resourceFlavorProfileUpdate(d *schema.ResourceData, m interface{}) error {
 	id := d.Id()
 	description := d.Get("description").(string)
 	name := d.Get("name").(string)
-	regionID := d.Get("region_id").(string)
 	flavorMapping := expandFlavors(d.Get("flavor_mapping").(*schema.Set).List())
 
-	_, err := apiClient.FlavorProfile.UpdateFlavorProfile(flavor_profile.NewUpdateFlavorProfileParams().WithID(id).WithBody(&models.FlavorProfileSpecification{
+	_, err := apiClient.FlavorProfile.UpdateFlavorProfile(flavor_profile.NewUpdateFlavorProfileParams().WithID(id).WithBody(&models.UpdateFlavorProfileSpecification{
 		Description:   description,
 		Name:          &name,
-		RegionID:      &regionID,
 		FlavorMapping: flavorMapping,
 	}))
 	if err != nil {

vra/resource_image_profile.go

@@ -125,10 +125,9 @@ func resourceImageProfileUpdate(d *schema.ResourceData, m interface{}) error {
 	id := d.Id()
 	imageMapping := expandImageMapping(d.Get("image_mapping").(*schema.Set).List())
 
-	_, err := apiClient.ImageProfile.UpdateImageProfile(image_profile.NewUpdateImageProfileParams().WithID(id).WithBody(&models.ImageProfileSpecification{
+	_, err := apiClient.ImageProfile.UpdateImageProfile(image_profile.NewUpdateImageProfileParams().WithID(id).WithBody(&models.UpdateImageProfileSpecification{
 		Description:  d.Get("description").(string),
 		Name:         withString(d.Get("name").(string)),
-		RegionID:     withString(d.Get("region_id").(string)),
 		ImageMapping: imageMapping,
 	}))
 	if err != nil {