diff --git a/scaleway/helpers_compute_instance.go b/scaleway/helpers_compute_instance.go index 78fbc62eac..b6c2b9344c 100644 --- a/scaleway/helpers_compute_instance.go +++ b/scaleway/helpers_compute_instance.go @@ -24,19 +24,19 @@ const ( // getInstanceAPIWithZone returns a new instance API and the zone for a Create request func getInstanceAPIWithZone(d *schema.ResourceData, m interface{}) (*instance.API, utils.Zone, error) { meta := m.(*Meta) - instanceApi := instance.NewAPI(meta.scwClient) + instanceAPI := instance.NewAPI(meta.scwClient) zone, err := getZone(d, meta) - return instanceApi, zone, err + return instanceAPI, zone, err } // getInstanceAPIWithZoneAndID returns an instance API with zone and ID extracted from the state func getInstanceAPIWithZoneAndID(m interface{}, id string) (*instance.API, utils.Zone, string, error) { meta := m.(*Meta) - instanceApi := instance.NewAPI(meta.scwClient) + instanceAPI := instance.NewAPI(meta.scwClient) zone, ID, err := parseZonedID(id) - return instanceApi, zone, ID, err + return instanceAPI, zone, ID, err } func userDataHash(v interface{}) int { @@ -94,10 +94,10 @@ func computeServerStateToAction(previousState, nextState string, forceReboot boo } // reachState executes server action(s) to reach the expected state -func reachState(instanceApi *instance.API, zone utils.Zone, serverID, fromState, toState string, forceReboot bool) error { +func reachState(instanceAPI *instance.API, zone utils.Zone, serverID, fromState, toState string, forceReboot bool) error { for _, action := range computeServerStateToAction(fromState, toState, forceReboot) { err := resource.Retry(ServerRetryFuncTimeout, func() *resource.RetryError { - err := instanceApi.ServerActionAndWait(&instance.ServerActionAndWaitRequest{ + err := instanceAPI.ServerActionAndWait(&instance.ServerActionAndWaitRequest{ Zone: zone, ServerID: serverID, Action: action, diff --git a/scaleway/resource_compute_instance_ip.go b/scaleway/resource_compute_instance_ip.go index 4a3ff13982..f01d4d1896 100644 --- a/scaleway/resource_compute_instance_ip.go +++ b/scaleway/resource_compute_instance_ip.go @@ -40,12 +40,12 @@ func resourceScalewayComputeInstanceIP() *schema.Resource { } func resourceScalewayComputeInstanceIPCreate(d *schema.ResourceData, m interface{}) error { - instanceApi, zone, err := getInstanceAPIWithZone(d, m) + instanceAPI, zone, err := getInstanceAPIWithZone(d, m) if err != nil { return err } - res, err := instanceApi.CreateIP(&instance.CreateIPRequest{ + res, err := instanceAPI.CreateIP(&instance.CreateIPRequest{ Zone: zone, Organization: d.Get("project_id").(string), }) @@ -55,7 +55,7 @@ func resourceScalewayComputeInstanceIPCreate(d *schema.ResourceData, m interface reverse := d.Get("reverse").(string) if reverse != "" { - _, err = instanceApi.UpdateIP(&instance.UpdateIPRequest{ + _, err = instanceAPI.UpdateIP(&instance.UpdateIPRequest{ Zone: zone, IPID: res.IP.ID, Reverse: &reverse, @@ -69,7 +69,7 @@ func resourceScalewayComputeInstanceIPCreate(d *schema.ResourceData, m interface serverID := expandID(d.Get("server_id")) if serverID != "" { - _, err = instanceApi.AttachIP(&instance.AttachIPRequest{ + _, err = instanceAPI.AttachIP(&instance.AttachIPRequest{ Zone: zone, IPID: res.IP.ID, ServerID: serverID, @@ -83,12 +83,12 @@ func resourceScalewayComputeInstanceIPCreate(d *schema.ResourceData, m interface } func resourceScalewayComputeInstanceIPRead(d *schema.ResourceData, m interface{}) error { - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) if err != nil { return err } - res, err := instanceApi.GetIP(&instance.GetIPRequest{ + res, err := instanceAPI.GetIP(&instance.GetIPRequest{ IPID: ID, Zone: zone, }) @@ -111,7 +111,7 @@ func resourceScalewayComputeInstanceIPRead(d *schema.ResourceData, m interface{} } func resourceScalewayComputeInstanceIPUpdate(d *schema.ResourceData, m interface{}) error { - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) if err != nil { return err } @@ -120,7 +120,7 @@ func resourceScalewayComputeInstanceIPUpdate(d *schema.ResourceData, m interface l.Debugf("updating IP %q reverse to %q\n", d.Id(), d.Get("reverse")) reverse := d.Get("reverse").(string) - _, err = instanceApi.UpdateIP(&instance.UpdateIPRequest{ + _, err = instanceAPI.UpdateIP(&instance.UpdateIPRequest{ Zone: zone, IPID: ID, Reverse: &reverse, @@ -133,13 +133,13 @@ func resourceScalewayComputeInstanceIPUpdate(d *schema.ResourceData, m interface if d.HasChange("server_id") { serverID := expandID(d.Get("server_id")) if serverID != "" { - _, err = instanceApi.AttachIP(&instance.AttachIPRequest{ + _, err = instanceAPI.AttachIP(&instance.AttachIPRequest{ Zone: zone, IPID: ID, ServerID: serverID, }) } else { - _, err = instanceApi.DetachIP(&instance.DetachIPRequest{ + _, err = instanceAPI.DetachIP(&instance.DetachIPRequest{ Zone: zone, IPID: ID, }) @@ -153,12 +153,12 @@ func resourceScalewayComputeInstanceIPUpdate(d *schema.ResourceData, m interface } func resourceScalewayComputeInstanceIPDelete(d *schema.ResourceData, m interface{}) error { - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) if err != nil { return err } - err = instanceApi.DeleteIP(&instance.DeleteIPRequest{ + err = instanceAPI.DeleteIP(&instance.DeleteIPRequest{ IPID: ID, Zone: zone, }) diff --git a/scaleway/resource_compute_instance_ip_test.go b/scaleway/resource_compute_instance_ip_test.go index 4382444aa8..16bb10bdea 100644 --- a/scaleway/resource_compute_instance_ip_test.go +++ b/scaleway/resource_compute_instance_ip_test.go @@ -101,12 +101,12 @@ func testAccCheckScalewayComputeInstanceIPExists(n string) resource.TestCheckFun return fmt.Errorf("resource not found: %s", n) } - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), rs.Primary.ID) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), rs.Primary.ID) if err != nil { return err } - _, err = instanceApi.GetIP(&instance.GetIPRequest{ + _, err = instanceAPI.GetIP(&instance.GetIPRequest{ IPID: ID, Zone: zone, }) @@ -130,12 +130,12 @@ func testAccCheckScalewayComputeInstanceIPPairWithServer(ipResource, serverResou return fmt.Errorf("resource not found: %s", serverResource) } - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), ipState.Primary.ID) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), ipState.Primary.ID) if err != nil { return err } - server, err := instanceApi.GetServer(&instance.GetServerRequest{ + server, err := instanceAPI.GetServer(&instance.GetServerRequest{ Zone: zone, ServerID: expandID(serverState.Primary.ID), }) @@ -143,7 +143,7 @@ func testAccCheckScalewayComputeInstanceIPPairWithServer(ipResource, serverResou return err } - ip, err := instanceApi.GetIP(&instance.GetIPRequest{ + ip, err := instanceAPI.GetIP(&instance.GetIPRequest{ IPID: ID, Zone: zone, }) @@ -166,12 +166,12 @@ func testAccCheckScalewayComputeInstanceServerNoIPAssigned(serverResource string return fmt.Errorf("resource not found: %s", serverResource) } - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), serverState.Primary.ID) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), serverState.Primary.ID) if err != nil { return err } - server, err := instanceApi.GetServer(&instance.GetServerRequest{ + server, err := instanceAPI.GetServer(&instance.GetServerRequest{ Zone: zone, ServerID: ID, }) @@ -193,12 +193,12 @@ func testAccCheckScalewayComputeInstanceIPDestroy(s *terraform.State) error { continue } - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), rs.Primary.ID) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), rs.Primary.ID) if err != nil { return err } - _, err = instanceApi.GetIP(&instance.GetIPRequest{ + _, err = instanceAPI.GetIP(&instance.GetIPRequest{ Zone: zone, IPID: ID, }) diff --git a/scaleway/resource_compute_instance_server.go b/scaleway/resource_compute_instance_server.go index fa32ba66b2..c08f3a34ac 100644 --- a/scaleway/resource_compute_instance_server.go +++ b/scaleway/resource_compute_instance_server.go @@ -161,7 +161,7 @@ func resourceScalewayComputeInstanceServer() *schema.Resource { } func resourceScalewayComputeInstanceServerCreate(d *schema.ResourceData, m interface{}) error { - instanceApi, zone, err := getInstanceAPIWithZone(d, m) + instanceAPI, zone, err := getInstanceAPIWithZone(d, m) if err != nil { return err } @@ -205,7 +205,7 @@ func resourceScalewayComputeInstanceServerCreate(d *schema.ResourceData, m inter } } - res, err := instanceApi.CreateServer(req) + res, err := instanceAPI.CreateServer(req) if err != nil { return err } @@ -235,13 +235,13 @@ func resourceScalewayComputeInstanceServerCreate(d *schema.ResourceData, m inter } if len(userDataRequests.UserData) > 0 { - err := instanceApi.SetAllServerUserData(userDataRequests) + err := instanceAPI.SetAllServerUserData(userDataRequests) if err != nil { return err } } - err = reachState(instanceApi, zone, res.Server.ID, ServerStateStopped, d.Get("state").(string), false) + err = reachState(instanceAPI, zone, res.Server.ID, ServerStateStopped, d.Get("state").(string), false) if err != nil { return err } @@ -250,7 +250,7 @@ func resourceScalewayComputeInstanceServerCreate(d *schema.ResourceData, m inter } func resourceScalewayComputeInstanceServerRead(d *schema.ResourceData, m interface{}) error { - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) if err != nil { return err } @@ -258,7 +258,7 @@ func resourceScalewayComputeInstanceServerRead(d *schema.ResourceData, m interfa //// // Read Server //// - response, err := instanceApi.GetServer(&instance.GetServerRequest{ + response, err := instanceAPI.GetServer(&instance.GetServerRequest{ Zone: zone, ServerID: ID, }) @@ -330,7 +330,7 @@ func resourceScalewayComputeInstanceServerRead(d *schema.ResourceData, m interfa //// // Read server user data //// - allUserData, err := instanceApi.GetAllServerUserData(&instance.GetAllServerUserDataRequest{ + allUserData, err := instanceAPI.GetAllServerUserData(&instance.GetAllServerUserDataRequest{ Zone: zone, ServerID: ID, }) @@ -358,7 +358,7 @@ func resourceScalewayComputeInstanceServerRead(d *schema.ResourceData, m interfa } func resourceScalewayComputeInstanceServerUpdate(d *schema.ResourceData, m interface{}) error { - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) if err != nil { return err } @@ -409,9 +409,9 @@ func resourceScalewayComputeInstanceServerUpdate(d *schema.ResourceData, m inter var updateResponse *instance.UpdateServerResponse err = resource.Retry(ServerRetryFuncTimeout, func() *resource.RetryError { - updateResponse, err = instanceApi.UpdateServer(updateRequest) + updateResponse, err = instanceAPI.UpdateServer(updateRequest) if isSDKResponseError(err, http.StatusBadRequest, "Instance must be powered off to change local volumes") { - err = reachState(instanceApi, zone, ID, previousState.(string), ServerStateStopped, false) + err = reachState(instanceAPI, zone, ID, previousState.(string), ServerStateStopped, false) if err != nil && !isSDKResponseError(err, http.StatusBadRequest, "server should be running") { return resource.NonRetryableError(err) } @@ -459,7 +459,7 @@ func resourceScalewayComputeInstanceServerUpdate(d *schema.ResourceData, m inter forceReboot = true // instance must reboot when cloud init script change } - err := instanceApi.SetAllServerUserData(userDataRequests) + err := instanceAPI.SetAllServerUserData(userDataRequests) if err != nil { return err } @@ -467,7 +467,7 @@ func resourceScalewayComputeInstanceServerUpdate(d *schema.ResourceData, m inter } // reach expected state - err = reachState(instanceApi, zone, ID, previousState.(string), nextState.(string), forceReboot) + err = reachState(instanceAPI, zone, ID, previousState.(string), nextState.(string), forceReboot) if err != nil { return err } @@ -476,13 +476,13 @@ func resourceScalewayComputeInstanceServerUpdate(d *schema.ResourceData, m inter } func resourceScalewayComputeInstanceServerDelete(d *schema.ResourceData, m interface{}) error { - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(m, d.Id()) if err != nil { return err } // reach stopped state - err = reachState(instanceApi, zone, ID, d.Get("state").(string), ServerStateStopped, false) + err = reachState(instanceAPI, zone, ID, d.Get("state").(string), ServerStateStopped, false) if is404Error(err) { return nil } @@ -490,7 +490,7 @@ func resourceScalewayComputeInstanceServerDelete(d *schema.ResourceData, m inter return err } - err = instanceApi.DeleteServer(&instance.DeleteServerRequest{ + err = instanceAPI.DeleteServer(&instance.DeleteServerRequest{ Zone: zone, ServerID: ID, }) @@ -500,7 +500,7 @@ func resourceScalewayComputeInstanceServerDelete(d *schema.ResourceData, m inter } if d.Get("root_volume.0.delete_on_termination").(bool) { - err = instanceApi.DeleteVolume(&instance.DeleteVolumeRequest{ + err = instanceAPI.DeleteVolume(&instance.DeleteVolumeRequest{ Zone: zone, VolumeID: d.Get("root_volume.0.volume_id").(string), }) diff --git a/scaleway/resource_compute_instance_server_test.go b/scaleway/resource_compute_instance_server_test.go index 48d897ad84..5d3f6b7854 100644 --- a/scaleway/resource_compute_instance_server_test.go +++ b/scaleway/resource_compute_instance_server_test.go @@ -318,12 +318,12 @@ func testAccCheckScalewayComputeInstanceServerExists(n string) resource.TestChec return fmt.Errorf("resource not found: %s", n) } - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), rs.Primary.ID) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), rs.Primary.ID) if err != nil { return err } - _, err = instanceApi.GetServer(&instance.GetServerRequest{ServerID: ID, Zone: zone}) + _, err = instanceAPI.GetServer(&instance.GetServerRequest{ServerID: ID, Zone: zone}) if err != nil { return err } @@ -338,12 +338,12 @@ func testAccCheckScalewayComputeInstanceServerDestroy(s *terraform.State) error continue } - instanceApi, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), rs.Primary.ID) + instanceAPI, zone, ID, err := getInstanceAPIWithZoneAndID(testAccProvider.Meta(), rs.Primary.ID) if err != nil { return err } - _, err = instanceApi.GetServer(&instance.GetServerRequest{ + _, err = instanceAPI.GetServer(&instance.GetServerRequest{ ServerID: ID, Zone: zone, })