Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/services/instance/ip.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func ResourceInstanceIPRead(ctx context.Context, d *schema.ResourceData, m any)
Zone: zone,
}, scw.WithContext(ctx))
if err != nil {
// We check for 403 because instanceSDK API returns 403 for a deleted IP
// We check for 403 because instance API returns 403 for a deleted IP
if httperrors.Is404(err) || httperrors.Is403(err) {
d.SetId("")

Expand Down Expand Up @@ -202,7 +202,7 @@ func ResourceInstanceIPDelete(ctx context.Context, d *schema.ResourceData, m any
Zone: zone,
}, scw.WithContext(ctx))
if err != nil {
// We check for 403 because instanceSDK API returns 403 for a deleted IP
// We check for 403 because instance API returns 403 for a deleted IP
if httperrors.Is404(err) || httperrors.Is403(err) {
d.SetId("")

Expand Down
2 changes: 1 addition & 1 deletion internal/services/instance/ip_reverse_dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func ResourceInstanceIPReverseDNSRead(ctx context.Context, d *schema.ResourceDat
Zone: zone,
}, scw.WithContext(ctx))
if err != nil {
// We check for 403 because instanceSDK API returns 403 for a deleted IP
// We check for 403 because instance API returns 403 for a deleted IP
if httperrors.Is404(err) || httperrors.Is403(err) {
d.SetId("")

Expand Down
4 changes: 2 additions & 2 deletions internal/services/instance/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m
if err != nil {
return diag.FromErr(err)
}
// detach eip to ensure to free eip even if instanceSDK won't stop
// detach eip to ensure to free eip even if instance won't stop
if ipID, ok := d.GetOk("ip_id"); ok {
_, err := api.UpdateIP(&instanceSDK.UpdateIPRequest{
Zone: zone,
Expand All @@ -1200,7 +1200,7 @@ func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m
log.Print("[WARN] Failed to detach eip of server")
}
}
// Remove instanceSDK from placement group to free it even if instanceSDK won't stop
// Remove instance from placement group to free it even if instance won't stop
if _, ok := d.GetOk("placement_group_id"); ok {
_, err := api.UpdateServer(&instanceSDK.UpdateServerRequest{
Zone: zone,
Expand Down
2 changes: 1 addition & 1 deletion internal/services/instance/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ func arePrivateNICsPresent(tt *acctest.TestTools, n string) resource.TestCheckFu
}

// serverHasNewVolume tests if volume name is generated by terraform
// It is useful as volume should not be set in request when creating an instanceSDK from an image
// It is useful as volume should not be set in request when creating an instance from an image
func serverHasNewVolume(_ *acctest.TestTools, n string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
Expand Down
2 changes: 1 addition & 1 deletion internal/services/instance/testfuncs/checks.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func IsIPDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
case err == nil:
return retry.RetryableError(fmt.Errorf("instance IP (%s) still exists", rs.Primary.ID))
// Unexpected api error we return it
// We check for 403 because instanceSDK API return 403 for deleted IP
// We check for 403 because instance API return 403 for deleted IP
case httperrors.Is404(err) || httperrors.Is403(err):
continue
default:
Expand Down
Loading