fix(instance): fix placement group renaming (#673)

Author: remyleone

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/google/go-cmp v0.5.2
 	github.com/hashicorp/go-retryablehttp v0.6.7
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.2.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20201012095732-98ec365545de
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20201106174615-fd524d38cee8
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1

go.sum

@@ -299,6 +299,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20201012095732-98ec365545de h1:yhT7zTv3WAMD3S3GqkpAFIL8O76emUsBKsiBcVBb4Bg=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20201012095732-98ec365545de/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20201106174615-fd524d38cee8 h1:OUM8gK4Frdx3yhDJWQSToADtrvCTGaZXYrm6O3j3JaQ=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20201106174615-fd524d38cee8/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=

scaleway/resource_instance_placement_group.go

@@ -118,16 +118,27 @@ func resourceScalewayInstancePlacementGroupUpdate(ctx context.Context, d *schema
 	req := &instance.UpdatePlacementGroupRequest{
 		Zone:             zone,
 		PlacementGroupID: ID,
-		PolicyMode:       instance.PlacementGroupPolicyMode(d.Get("policy_mode").(string)),
-		PolicyType:       instance.PlacementGroupPolicyType(d.Get("policy_type").(string)),
 	}
 
-	hasChanged := d.HasChanges("policy_mode", "policy_type")
+	hasChanged := false
 
 	if d.HasChange("name") {
 		req.Name = expandStringPtr(d.Get("name").(string))
 		hasChanged = true
 	}
+
+	if d.HasChange("policy_mode") {
+		policyMode := instance.PlacementGroupPolicyMode(d.Get("policy_mode").(string))
+		req.PolicyMode = &policyMode
+		hasChanged = true
+	}
+
+	if d.HasChange("policy_type") {
+		policyType := instance.PlacementGroupPolicyType(d.Get("policy_type").(string))
+		req.PolicyType = &policyType
+		hasChanged = true
+	}
+
 	if hasChanged {
 		_, err = instanceAPI.UpdatePlacementGroup(req, scw.WithContext(ctx))
 		if err != nil {

scaleway/resource_instance_placement_group_test.go

@@ -88,6 +88,48 @@ func TestAccScalewayInstancePlacementGroup_Basic(t *testing.T) {
 	})
 }
 
+func TestAccScalewayInstancePlacementGroup_Rename(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayInstancePlacementGroupDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					resource "scaleway_instance_placement_group" "base" {
+						name        = "foo"
+						policy_mode = "enforced"
+						policy_type = "low_latency"
+					}
+
+					resource "scaleway_instance_server" "base" {
+						type  = "DEV1-S"
+						image = "ubuntu_focal"
+						placement_group_id = "${scaleway_instance_placement_group.base.id}"
+					}`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayInstancePlacementGroupExists(tt, "scaleway_instance_placement_group.base"),
+					resource.TestCheckResourceAttr("scaleway_instance_placement_group.base", "name", "foo"),
+				),
+			},
+			{
+				Config: `
+					resource "scaleway_instance_placement_group" "base" {
+						name        = "bar"
+						policy_mode = "enforced"
+						policy_type = "low_latency"
+					}`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayInstancePlacementGroupExists(tt, "scaleway_instance_placement_group.base"),
+					resource.TestCheckResourceAttr("scaleway_instance_placement_group.base", "name", "bar"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckScalewayInstancePlacementGroupExists(tt *TestTools, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]

scaleway/resource_instance_server.go

@@ -186,6 +186,7 @@ func resourceScalewayInstanceServer() *schema.Resource {
 			"bootscript_id": {
 				Type:         schema.TypeString,
 				Optional:     true,
+				Computed:     true,
 				Description:  "ID of the target bootscript (set boot_type to bootscript)",
 				ValidateFunc: validationUUID(),
 			},