Skip to content

Commit

Permalink
fix: lint naming of instanceAPI (scaleway#197)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DenBeke @kindermoumoute
DenBeke authored and kindermoumoute committed Jul 4, 2019
1 parent 7c7875d commit f1c86a2
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 47 deletions.
12 changes: 6 additions & 6 deletions scaleway/helpers_compute_instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
Expand Down
24 changes: 12 additions & 12 deletions scaleway/resource_compute_instance_ip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
})
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
})
Expand All @@ -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
}
Expand All @@ -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,
Expand All @@ -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,
})
Expand All @@ -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,
})
Expand Down
18 changes: 9 additions & 9 deletions scaleway/resource_compute_instance_ip_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
Expand All @@ -130,20 +130,20 @@ 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),
})
if err != nil {
return err
}

ip, err := instanceApi.GetIP(&instance.GetIPRequest{
ip, err := instanceAPI.GetIP(&instance.GetIPRequest{
IPID: ID,
Zone: zone,
})
Expand All @@ -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,
})
Expand All @@ -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,
})
Expand Down
32 changes: 16 additions & 16 deletions scaleway/resource_compute_instance_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand All @@ -250,15 +250,15 @@ 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
}

////
// Read Server
////
response, err := instanceApi.GetServer(&instance.GetServerRequest{
response, err := instanceAPI.GetServer(&instance.GetServerRequest{
Zone: zone,
ServerID: ID,
})
Expand Down Expand Up @@ -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,
})
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -459,15 +459,15 @@ 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
}

}

// 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
}
Expand All @@ -476,21 +476,21 @@ 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
}
if err != nil {
return err
}

err = instanceApi.DeleteServer(&instance.DeleteServerRequest{
err = instanceAPI.DeleteServer(&instance.DeleteServerRequest{
Zone: zone,
ServerID: ID,
})
Expand All @@ -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),
})
Expand Down
8 changes: 4 additions & 4 deletions scaleway/resource_compute_instance_server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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,
})
Expand Down

0 comments on commit f1c86a2

Please sign in to comment.