lint

Author: Codelax

internal/services/block/volume.go

@@ -93,14 +93,13 @@ func ResourceBlockVolumeCreate(ctx context.Context, d *schema.ResourceData, m in
 	}
 
 	var volume *block.Volume
-	instanceVolumeID, migrateVolume := d.GetOk("instance_volume_id")
 
+	instanceVolumeID, migrateVolume := d.GetOk("instance_volume_id")
 	if migrateVolume {
 		volume, err = migrateInstanceToBlockVolume(ctx, api, zone, locality.ExpandID(instanceVolumeID.(string)), d.Timeout(schema.TimeoutCreate))
 		if err != nil {
 			return diag.FromErr(err)
 		}
-
 	} else {
 		req := &block.CreateVolumeRequest{
 			Zone:      zone,

internal/services/instance/instancehelpers/block.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
+	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"

internal/services/instance/instancehelpers/waiters_test.go

@@ -1,22 +1,23 @@
-package instancehelpers
+package instancehelpers_test
 
 import (
 	"testing"
 
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/instancehelpers"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestUnknownVolume_VolumeTemplate(t *testing.T) {
 	tests := []struct {
 		name   string
-		volume *UnknownVolume
+		volume *instancehelpers.UnknownVolume
 		want   *instance.VolumeServerTemplate
 	}{
 		{
 			name: "Root Volume",
-			volume: &UnknownVolume{
+			volume: &instancehelpers.UnknownVolume{
 				Name:               "",
 				ID:                 "",
 				InstanceVolumeType: instance.VolumeVolumeTypeLSSD,
@@ -31,7 +32,7 @@ func TestUnknownVolume_VolumeTemplate(t *testing.T) {
 		},
 		{
 			name: "Root Volume from ID",
-			volume: &UnknownVolume{
+			volume: &instancehelpers.UnknownVolume{
 				Name:               "tf-vol-stoic-johnson",
 				ID:                 "25152794-d15a-4dd5-abfc-b19ec276aa20",
 				InstanceVolumeType: instance.VolumeVolumeTypeLSSD,
@@ -46,7 +47,7 @@ func TestUnknownVolume_VolumeTemplate(t *testing.T) {
 		},
 		{
 			name: "Additional Volume sbs",
-			volume: &UnknownVolume{
+			volume: &instancehelpers.UnknownVolume{
 				Name:               "tf-volume-elegant-minsky",
 				ID:                 "cc380989-b71b-47f0-829f-062e329f4097",
 				InstanceVolumeType: instance.VolumeVolumeTypeSbsVolume,

internal/services/instance/snapshot_data_source_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
+	instancetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
 )
 
 func TestAccDataSourceSnapshot_Basic(t *testing.T) {

internal/services/instance/volume_data_source_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
+	instancetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
 )
 
 func TestAccDataSourceVolume_Basic(t *testing.T) {

internal/services/instance/volume_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
+	instancetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
 )
 
 func TestAccVolume_Basic(t *testing.T) {