Implement volume automount (hetznercloud#58)

Gopkg.toml

@@ -4,4 +4,4 @@
 
 [[constraint]]
   name = "github.com/hetznercloud/hcloud-go"
-  version = "1.11.0"
+  version = "v1.12.0"

hcloud/resource_hcloud_volume.go

@@ -47,6 +47,14 @@ func resourceVolume() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"automount": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			"format": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -73,6 +81,12 @@ func resourceVolumeCreate(d *schema.ResourceData, m interface{}) error {
 		}
 		opts.Labels = tmpLabels
 	}
+	if automount, ok := d.GetOk("automount"); ok {
+		opts.Automount = hcloud.Bool(automount.(bool))
+	}
+	if format, ok := d.GetOk("format"); ok {
+		opts.Format = hcloud.String(format.(string))
+	}
 
 	result, _, err := client.Volume.Create(ctx, opts)
 	if err != nil {
@@ -178,6 +192,7 @@ func resourceVolumeUpdate(d *schema.ResourceData, m interface{}) error {
 				}
 			}
 			action, _, err := client.Volume.Attach(ctx, volume, &hcloud.Server{ID: serverID})
+
 			if err != nil {
 				if resourceVolumeIsNotFound(err, d) {
 					return nil

hcloud/resource_hcloud_volume_attachment.go

@@ -27,6 +27,11 @@ func resourceVolumeAttachment() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"automount": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -42,9 +47,16 @@ func resourceVolumeAttachmentCreate(d *schema.ResourceData, m interface{}) error
 
 	server := &hcloud.Server{ID: serverID.(int)}
 
-	action, _, err := client.Volume.Attach(ctx, volume, server)
+	opts := hcloud.VolumeAttachOpts{
+		Server: server,
+	}
+	if automount, ok := d.GetOk("automount"); ok {
+		opts.Automount = hcloud.Bool(automount.(bool))
+	}
+
+	action, _, err := client.Volume.AttachWithOpts(ctx, volume, opts)
 	if err != nil {
-		if hcloud.IsError(err, "locked") {
+		if hcloud.IsError(err, hcloud.ErrorCodeLocked) {
 			log.Printf("[INFO] Server (%v) locked, retrying in one second", serverID)
 			time.Sleep(time.Second)
 			return resourceVolumeAttachmentCreate(d, m)
@@ -125,7 +137,7 @@ func resourceVolumeAttachmentDelete(d *schema.ResourceData, m interface{}) error
 	if volume.Server != nil {
 		action, _, err := client.Volume.Detach(ctx, volume)
 		if err != nil {
-			if hcloud.IsError(err, "locked") {
+			if hcloud.IsError(err, hcloud.ErrorCodeLocked) {
 				log.Printf("[INFO] Server (%v) locked, retrying in one second", volume.Server.ID)
 				time.Sleep(time.Second)
 				return resourceVolumeAttachmentDelete(d, m)

hcloud/resource_hcloud_volume_attachment_test.go

@@ -112,6 +112,7 @@ func testAccHcloudCheckVolumeAttachmentConfig(serverID int) string {
 resource "hcloud_volume_attachment" "foobar_attachment" {
   volume_id = "${hcloud_volume.foobar_volume.id}"
   server_id = "${hcloud_server.foobar.id}"
+  automount = true
 }
 
 resource "hcloud_server" "foobar" {

hcloud/resource_hcloud_volume_test.go

@@ -76,6 +76,18 @@ func TestAccHcloudVolume_Basic(t *testing.T) {
 						"hcloud_volume.foobar", "location", "nbg1"),
 				),
 			},
+			{
+				Config: testAccHcloudCheckVolumeConfig_WithAutomount(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccHcloudCheckVolumeExists("hcloud_volume.foobar2", &volume),
+					resource.TestCheckResourceAttr(
+						"hcloud_volume.foobar2", "name", fmt.Sprintf("foo-volume-%d", rInt)),
+					resource.TestCheckResourceAttr(
+						"hcloud_volume.foobar2", "size", "10"),
+					resource.TestCheckResourceAttr(
+						"hcloud_volume.foobar2", "location", "nbg1"),
+				),
+			},
 		},
 	})
 }
@@ -132,6 +144,24 @@ resource "hcloud_volume" "foobar" {
 `, rInt, rInt)
 }
 
+func testAccHcloudCheckVolumeConfig_WithAutomount(rInt int) string {
+	return fmt.Sprintf(`
+resource "hcloud_server" "server_volume_foobar2" {
+  name        = "foo-volume-server2-%d"
+  server_type = "cx11"
+  image       = "debian-9"
+  datacenter  = "nbg1-dc3"
+}
+resource "hcloud_volume" "foobar2" {
+  name       = "foo-volume-%d"
+  size       = 10
+  server_id  = "${hcloud_server.server_volume_foobar2.id}"
+  automount  = true
+  format     = "ext4"
+}
+`, rInt, rInt)
+}
+
 func testAccHcloudCheckVolumeDestroy(s *terraform.State) error {
 	client := testAccProvider.Meta().(*hcloud.Client)