fix(instance): use expandStringPtr for Organization (#712)

Signed-off-by: Patrik Cyvoct <[email protected]>

Author: Sh4d1

scaleway/resource_instance_placement_group.go

@@ -4,7 +4,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
-	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
 func resourceScalewayInstancePlacementGroup() *schema.Resource {
@@ -64,7 +63,7 @@ func resourceScalewayInstancePlacementGroupCreate(d *schema.ResourceData, m inte
 	res, err := instanceApi.CreatePlacementGroup(&instance.CreatePlacementGroupRequest{
 		Zone:         zone,
 		Name:         expandOrGenerateString(d.Get("name"), "pg"),
-		Organization: scw.StringPtr(d.Get("organization_id").(string)),
+		Organization: expandStringPtr(d.Get("organization_id").(string)),
 		PolicyMode:   instance.PlacementGroupPolicyMode(d.Get("policy_mode").(string)),
 		PolicyType:   instance.PlacementGroupPolicyType(d.Get("policy_type").(string)),
 	})

scaleway/resource_instance_security_group.go

@@ -99,7 +99,7 @@ func resourceScalewayInstanceSecurityGroupCreate(d *schema.ResourceData, m inter
 	res, err := instanceApi.CreateSecurityGroup(&instance.CreateSecurityGroupRequest{
 		Name:                  expandOrGenerateString(d.Get("name"), "sg"),
 		Zone:                  zone,
-		Organization:          scw.StringPtr(organizationID),
+		Organization:          expandStringPtr(organizationID),
 		Description:           d.Get("description").(string),
 		Stateful:              d.Get("stateful").(bool),
 		InboundDefaultPolicy:  instance.SecurityGroupPolicy(d.Get("inbound_default_policy").(string)),

scaleway/resource_instance_server.go

@@ -248,7 +248,7 @@ func resourceScalewayInstanceServerCreate(d *schema.ResourceData, m interface{})
 	req := &instance.CreateServerRequest{
 		Zone:              zone,
 		Name:              expandOrGenerateString(d.Get("name"), "srv"),
-		Organization:      scw.StringPtr(d.Get("organization_id").(string)),
+		Organization:      expandStringPtr(d.Get("organization_id").(string)),
 		Image:             image.ID,
 		CommercialType:    commercialType,
 		EnableIPv6:        d.Get("enable_ipv6").(bool),

scaleway/resource_instance_volume.go

@@ -81,7 +81,7 @@ func resourceScalewayInstanceVolumeCreate(d *schema.ResourceData, m interface{})
 		Zone:         zone,
 		Name:         expandOrGenerateString(d.Get("name"), "vol"),
 		VolumeType:   instance.VolumeVolumeType(d.Get("type").(string)),
-		Organization: scw.StringPtr(d.Get("organization_id").(string)),
+		Organization: expandStringPtr(d.Get("organization_id").(string)),
 	}
 
 	if size, ok := d.GetOk("size_in_gb"); ok {