chore: bump sdk

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/hashicorp/terraform-plugin-sdk v1.0.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/nicolai86/scaleway-sdk v0.0.0-20181024210327-b20018e944c4
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200625143330-d3e0c6c20474
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200923142616-ae5d7880b199
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
 	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7

go.sum

@@ -183,6 +183,8 @@ github.com/posener/complete v1.2.1 h1:LrvDIY//XNo65Lq84G/akBuMGlawHvGBABv8f/ZN6D
 github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DKN0g6uH7E=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200625143330-d3e0c6c20474 h1:IkOChjasZthcGbr7j/7+KDneeQb/dcwQp+GeHLpiXNE=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200625143330-d3e0c6c20474/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200923142616-ae5d7880b199 h1:SVgNpFhrq0iOwzD4y881l0Bp7FwNTTjHhMmK/05vERw=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200923142616-ae5d7880b199/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/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=

scaleway/data_source_instance_image.go

@@ -114,7 +114,7 @@ func dataSourceScalewayInstanceImageRead(d *schema.ResourceData, m interface{})
 			return fmt.Errorf("%d images found with the same name %s and architecture %s in zone %s", len(res.Images), d.Get("name"), d.Get("architecture"), zone)
 		}
 		sort.Slice(res.Images, func(i, j int) bool {
-			return res.Images[i].ModificationDate.After(res.Images[j].ModificationDate)
+			return res.Images[i].ModificationDate.After(*res.Images[j].ModificationDate)
 		})
 		imageID = res.Images[0].ID
 	}
@@ -138,8 +138,8 @@ func dataSourceScalewayInstanceImageRead(d *schema.ResourceData, m interface{})
 	_ = d.Set("architecture", resp.Image.Arch)
 	_ = d.Set("name", resp.Image.Name)
 
-	_ = d.Set("creation_date", flattenTime(&resp.Image.CreationDate))
-	_ = d.Set("modification_date", flattenTime(&resp.Image.ModificationDate))
+	_ = d.Set("creation_date", flattenTime(resp.Image.CreationDate))
+	_ = d.Set("modification_date", flattenTime(resp.Image.ModificationDate))
 	_ = d.Set("public", resp.Image.Public)
 	_ = d.Set("from_server_id", resp.Image.FromServer)
 	_ = d.Set("state", resp.Image.State.String())

scaleway/resource_baremetal_server.go

@@ -138,7 +138,7 @@ func resourceScalewayBaremetalServerCreate(d *schema.ResourceData, m interface{}
 	server, err := baremetalAPI.CreateServer(&baremetal.CreateServerRequest{
 		Zone:           zone,
 		Name:           expandOrGenerateString(d.Get("name"), "bm"),
-		OrganizationID: d.Get("organization_id").(string),
+		OrganizationID: expandStringPtr(d.Get("organization_id")),
 		Description:    d.Get("description").(string),
 		OfferID:        offerID.ID,
 		Tags:           expandStrings(d.Get("tags")),

scaleway/resource_instance_placement_group.go

@@ -63,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: d.Get("organization_id").(string),
+		Organization: expandStringPtr(d.Get("organization_id")),
 		PolicyMode:   instance.PlacementGroupPolicyMode(d.Get("policy_mode").(string)),
 		PolicyType:   instance.PlacementGroupPolicyType(d.Get("policy_type").(string)),
 	})

scaleway/resource_instance_security_group.go

@@ -91,15 +91,10 @@ func resourceScalewayInstanceSecurityGroupCreate(d *schema.ResourceData, m inter
 		return err
 	}
 
-	organizationID, err := organizationID(d, meta)
-	if err != nil {
-		return err
-	}
-
 	res, err := instanceApi.CreateSecurityGroup(&instance.CreateSecurityGroupRequest{
 		Name:                  expandOrGenerateString(d.Get("name"), "sg"),
 		Zone:                  zone,
-		Organization:          organizationID,
+		Organization:          expandStringPtr(d.Get("organization_id")),
 		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:      d.Get("organization_id").(string),
+		Organization:      expandStringPtr(d.Get("organization_id")),
 		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: d.Get("organization_id").(string),
+		Organization: expandStringPtr(d.Get("organization_id")),
 	}
 
 	if size, ok := d.GetOk("size_in_gb"); ok {

scaleway/resource_k8s_cluster_beta.go

@@ -357,7 +357,7 @@ func resourceScalewayK8SClusterBetaCreate(d *schema.ResourceData, m interface{})
 
 	req := &k8s.CreateClusterRequest{
 		Region:           region,
-		OrganizationID:   d.Get("organization_id").(string),
+		OrganizationID:   expandStringPtr(d.Get("organization_id")),
 		Name:             expandOrGenerateString(d.Get("name"), "cluster"),
 		Description:      description.(string),
 		Cni:              k8s.CNI(d.Get("cni").(string)),

scaleway/resource_lb_backend_beta.go

@@ -243,7 +243,7 @@ func resourceScalewayLbBackendBetaCreate(d *schema.ResourceData, m interface{})
 
 	createReq := &lb.CreateBackendRequest{
 		Region:                   region,
-		LbID:                     LbID,
+		LBID:                     LbID,
 		Name:                     expandOrGenerateString(d.Get("name"), "lb-bkd"),
 		ForwardProtocol:          expandLbProtocol(d.Get("forward_protocol")),
 		ForwardPort:              int32(d.Get("forward_port").(int)),
@@ -297,7 +297,7 @@ func resourceScalewayLbBackendBetaRead(d *schema.ResourceData, m interface{}) er
 		return err
 	}
 
-	_ = d.Set("lb_id", newRegionalId(region, res.Lb.ID))
+	_ = d.Set("lb_id", newRegionalId(region, res.LB.ID))
 	_ = d.Set("name", res.Name)
 	_ = d.Set("forward_protocol", flattenLbProtocol(res.ForwardProtocol))
 	_ = d.Set("forward_port", res.ForwardPort)

scaleway/resource_lb_beta.go

@@ -64,10 +64,10 @@ func resourceScalewayLbBetaCreate(d *schema.ResourceData, m interface{}) error {
 		return err
 	}
 
-	createReq := &lb.CreateLbRequest{
+	createReq := &lb.CreateLBRequest{
 		Region:         region,
 		IPID:           scw.StringPtr(expandID(d.Get("ip_id").(string))),
-		OrganizationID: d.Get("organization_id").(string),
+		OrganizationID: expandStringPtr(d.Get("organization_id")),
 		Name:           expandOrGenerateString(d.Get("name"), "lb"),
 		Type:           d.Get("type").(string),
 	}
@@ -77,16 +77,16 @@ func resourceScalewayLbBetaCreate(d *schema.ResourceData, m interface{}) error {
 			createReq.Tags = append(createReq.Tags, tag.(string))
 		}
 	}
-	res, err := lbAPI.CreateLb(createReq)
+	res, err := lbAPI.CreateLB(createReq)
 	if err != nil {
 		return err
 	}
 
 	d.SetId(newRegionalId(region, res.ID))
 
-	_, err = lbAPI.WaitForLb(&lb.WaitForLbRequest{
+	_, err = lbAPI.WaitForLb(&lb.WaitForLBRequest{
 		Region:  region,
-		LbID:    res.ID,
+		LBID:    res.ID,
 		Timeout: scw.TimeDurationPtr(InstanceServerWaitForTimeout),
 	})
 	if err != nil {
@@ -102,9 +102,9 @@ func resourceScalewayLbBetaRead(d *schema.ResourceData, m interface{}) error {
 		return err
 	}
 
-	res, err := lbAPI.GetLb(&lb.GetLbRequest{
+	res, err := lbAPI.GetLB(&lb.GetLBRequest{
 		Region: region,
-		LbID:   ID,
+		LBID:   ID,
 	})
 
 	if err != nil {
@@ -135,14 +135,14 @@ func resourceScalewayLbBetaUpdate(d *schema.ResourceData, m interface{}) error {
 
 	if d.HasChange("name") || d.HasChange("tags") {
 
-		req := &lb.UpdateLbRequest{
+		req := &lb.UpdateLBRequest{
 			Region: region,
-			LbID:   ID,
+			LBID:   ID,
 			Name:   d.Get("name").(string),
 			Tags:   expandStrings(d.Get("tags")),
 		}
 
-		_, err = lbAPI.UpdateLb(req)
+		_, err = lbAPI.UpdateLB(req)
 		if err != nil {
 			return err
 		}
@@ -157,18 +157,18 @@ func resourceScalewayLbBetaDelete(d *schema.ResourceData, m interface{}) error {
 		return err
 	}
 
-	err = lbAPI.DeleteLb(&lb.DeleteLbRequest{
+	err = lbAPI.DeleteLB(&lb.DeleteLBRequest{
 		Region:    region,
-		LbID:      ID,
+		LBID:      ID,
 		ReleaseIP: false,
 	})
 
 	if err != nil && !is404Error(err) {
 		return err
 	}
 
-	_, err = lbAPI.WaitForLb(&lb.WaitForLbRequest{
-		LbID:    ID,
+	_, err = lbAPI.WaitForLb(&lb.WaitForLBRequest{
+		LBID:    ID,
 		Region:  region,
 		Timeout: scw.TimeDurationPtr(LbWaitForTimeout),
 	})

scaleway/resource_lb_beta_test.go

@@ -25,14 +25,14 @@ func testSweepLB(region string) error {
 	lbAPI := lb.NewAPI(scwClient)
 
 	l.Debugf("sweeper: destroying the lbs in (%s)", region)
-	listLBs, err := lbAPI.ListLbs(&lb.ListLbsRequest{}, scw.WithAllPages())
+	listLBs, err := lbAPI.ListLBs(&lb.ListLBsRequest{}, scw.WithAllPages())
 	if err != nil {
 		return fmt.Errorf("error listing lbs in (%s) in sweeper: %s", region, err)
 	}
 
-	for _, l := range listLBs.Lbs {
-		err := lbAPI.DeleteLb(&lb.DeleteLbRequest{
-			LbID:      l.ID,
+	for _, l := range listLBs.LBs {
+		err := lbAPI.DeleteLB(&lb.DeleteLBRequest{
+			LBID:      l.ID,
 			ReleaseIP: true,
 		})
 		if err != nil {
@@ -94,8 +94,8 @@ func testAccCheckScalewayLbBetaExists(n string) resource.TestCheckFunc {
 			return err
 		}
 
-		_, err = lbAPI.GetLb(&lb.GetLbRequest{
-			LbID:   ID,
+		_, err = lbAPI.GetLB(&lb.GetLBRequest{
+			LBID:   ID,
 			Region: region,
 		})
 
@@ -118,9 +118,9 @@ func testAccCheckScalewayLbBetaDestroy(s *terraform.State) error {
 			return err
 		}
 
-		_, err = lbAPI.GetLb(&lb.GetLbRequest{
+		_, err = lbAPI.GetLB(&lb.GetLBRequest{
 			Region: region,
-			LbID:   ID,
+			LBID:   ID,
 		})
 
 		// If no error resource still exist

scaleway/resource_lb_certificate_beta.go

@@ -113,7 +113,7 @@ func resourceScalewayLbCertificateBetaCreate(d *schema.ResourceData, m interface
 
 	createReq := &lb.CreateCertificateRequest{
 		Region:            region,
-		LbID:              lbID,
+		LBID:              lbID,
 		Name:              expandOrGenerateString(d.Get("name"), "lb-cert"),
 		Letsencrypt:       expandLbLetsEncrypt(d.Get("letsencrypt")),
 		CustomCertificate: expandLbCustomCertificate(d.Get("custom_certificate")),
@@ -156,8 +156,8 @@ func resourceScalewayLbCertificateBetaRead(d *schema.ResourceData, m interface{}
 	_ = d.Set("common_name", res.CommonName)
 	_ = d.Set("subject_alternative_name", res.SubjectAlternativeName)
 	_ = d.Set("fingerprint", res.Fingerprint)
-	_ = d.Set("not_valid_before", flattenTime(&res.NotValidBefore))
-	_ = d.Set("not_valid_after", flattenTime(&res.NotValidAfter))
+	_ = d.Set("not_valid_before", flattenTime(res.NotValidBefore))
+	_ = d.Set("not_valid_after", flattenTime(res.NotValidAfter))
 	_ = d.Set("status", res.Status)
 	return nil
 }

scaleway/resource_lb_frontend_beta.go

@@ -156,7 +156,7 @@ func resourceScalewayLbFrontendBetaCreate(d *schema.ResourceData, m interface{})
 
 	res, err := lbAPI.CreateFrontend(&lb.CreateFrontendRequest{
 		Region:        region,
-		LbID:          LbID,
+		LBID:          LbID,
 		Name:          expandOrGenerateString(d.Get("name"), "lb-frt"),
 		InboundPort:   int32(d.Get("inbound_port").(int)),
 		BackendID:     expandID(d.Get("backend_id")),
@@ -196,7 +196,7 @@ func resourceScalewayLbFrontendBetaRead(d *schema.ResourceData, m interface{}) e
 		return err
 	}
 
-	_ = d.Set("lb_id", newRegionalId(region, res.Lb.ID))
+	_ = d.Set("lb_id", newRegionalId(region, res.LB.ID))
 	_ = d.Set("backend_id", newRegionalId(region, res.Backend.ID))
 	_ = d.Set("name", res.Name)
 	_ = d.Set("inbound_port", int(res.InboundPort))

scaleway/resource_lb_ip_beta.go

@@ -47,7 +47,7 @@ func resourceScalewayLbIPBetaCreate(d *schema.ResourceData, m interface{}) error
 
 	createReq := &lb.CreateIPRequest{
 		Region:         region,
-		OrganizationID: d.Get("organization_id").(string),
+		OrganizationID: expandStringPtr(d.Get("organization_id")),
 		Reverse:        expandStringPtr(d.Get("reverse")),
 	}
 
@@ -85,7 +85,7 @@ func resourceScalewayLbIPBetaRead(d *schema.ResourceData, m interface{}) error {
 	_ = d.Set("ip_id", res.ID)
 	_ = d.Set("ip_address", res.IPAddress)
 	_ = d.Set("reverse", res.Reverse)
-	_ = d.Set("lb_ip", flattenStringPtr(res.LbID))
+	_ = d.Set("lb_ip", flattenStringPtr(res.LBID))
 
 	return nil
 }

scaleway/resource_lb_ip_beta_test.go

@@ -31,7 +31,7 @@ func testSweepLBIP(region string) error {
 	}
 
 	for _, ip := range listIPs.IPs {
-		if ip.LbID == nil {
+		if ip.LBID == nil {
 			err := lbAPI.ReleaseIP(&lb.ReleaseIPRequest{
 				IPID: ip.ID,
 			})

scaleway/resource_rdb_instance_beta.go

@@ -126,7 +126,7 @@ func resourceScalewayRdbInstanceBetaCreate(d *schema.ResourceData, m interface{}
 
 	createReq := &rdb.CreateInstanceRequest{
 		Region:         region,
-		OrganizationID: d.Get("organization_id").(string),
+		OrganizationID: expandStringPtr(d.Get("organization_id")),
 		Name:           expandOrGenerateString(d.Get("name"), "rdb"),
 		NodeType:       d.Get("node_type").(string),
 		Engine:         d.Get("engine").(string),

scaleway/resource_registry_namespace_beta.go

@@ -52,7 +52,7 @@ func resourceScalewayRegistryNamespaceBetaCreate(d *schema.ResourceData, m inter
 
 	ns, err := api.CreateNamespace(&registry.CreateNamespaceRequest{
 		Region:         region,
-		OrganizationID: d.Get("organization_id").(string),
+		OrganizationID: expandStringPtr(d.Get("organization_id")),
 		Name:           d.Get("name").(string),
 		Description:    d.Get("description").(string),
 		IsPublic:       d.Get("is_public").(bool),