Merge branch 'master' into feat/creating_instance_from_snapshot

Author: remyleone

.github/workflows/nightly.yml

@@ -48,6 +48,8 @@ jobs:
       # Checkout should always be before setup-go to ensure caching is working
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
       - name: Install Go
         uses: actions/setup-go@v5
         with:

.golangci.yml

@@ -18,6 +18,7 @@ linters:
     - errcheck # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases [fast: false, auto-fix: false]
     - errchkjson # Checks types passed to the json encoding functions. Reports unsupported types and optionally reports occasions, where the check for the returned error can be omitted. [fast: false, auto-fix: false]
     - errname # Checks that sentinel errors are prefixed with the `Err` and error types are suffixed with the `Error`. [fast: false, auto-fix: false]
+    - exptostd # Detects functions from golang.org/x/exp/ that can be replaced by std functions. [auto-fix]
     - forbidigo # Forbids identifiers [fast: true, auto-fix: false]
     - gci # Gci controls golang package import order and makes it always deterministic. [fast: true, auto-fix: false]
     - gocheckcompilerdirectives # Checks that go compiler directive comments (//go:) are valid. [fast: true, auto-fix: false]
@@ -48,6 +49,7 @@ linters:
     - musttag # enforce field tags in (un)marshaled structs [fast: false, auto-fix: false]
     - nakedret # Finds naked returns in functions greater than a specified function length [fast: true, auto-fix: false]
     - nilerr # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false]
+    - nlreturn # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: true]
     - noctx # noctx finds sending http request without context.Context [fast: false, auto-fix: false]
     - nolintlint # Reports ill-formed or insufficient nolint directives [fast: true, auto-fix: false]
     - nosprintfhostport # Checks for misuse of Sprintf to construct a host with port in a URL. [fast: true, auto-fix: false]
@@ -74,8 +76,10 @@ linters:
     - unconvert # Remove unnecessary type conversions [fast: false, auto-fix: false]
     - unused #(megacheck): Checks Go code for unused constants, variables, functions and types [fast: false, auto-fix: false]
     - usestdlibvars # A linter that detect the possibility to use variables/constants from the Go standard library. [fast: true, auto-fix: false]
+    - usetesting # Reports uses of functions with replacement inside the testing package. [auto-fix]
     - wastedassign # wastedassign finds wasted assignment statements. [fast: false, auto-fix: false]
     - whitespace # Tool for detection of leading and trailing whitespace [fast: true, auto-fix: true]
+    - wsl # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
     - zerologlint # Detects the wrong usage of `zerolog` that a user forgets to dispatch with `Send` or `Msg` [fast: false, auto-fix: false]
 
   disable:
@@ -97,9 +101,7 @@ linters:
     - mnd # An analyzer to detect magic numbers. [fast: true, auto-fix: false]
     - nestif # Reports deeply nested if statements [fast: true, auto-fix: false]
     - nilnil # Checks that there is no simultaneous return of `nil` error and an invalid value. [fast: false, auto-fix: false]
-    - nlreturn # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: false]
     - varnamelen # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false]
-    - wsl # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
 
 linters-settings:
   goconst:

internal/acctest/acctest.go

@@ -26,6 +26,7 @@ type TestTools struct {
 
 func NewTestTools(t *testing.T) *TestTools {
 	t.Helper()
+
 	ctx := context.Background()
 
 	folder, err := os.Getwd()
@@ -98,6 +99,7 @@ func extractGeneratedNamePrefix(name string) string {
 	//         ^
 	dashIndex = strings.LastIndex(name, "-")
 	name = name[:dashIndex]
+
 	return name
 }
 
@@ -141,6 +143,7 @@ func compareJSONBodies(expected, actual map[string]interface{}) bool {
 			// We do not want to generate new cassettes for each new features
 			continue
 		}
+
 		if !compareJSONFields(expectedValue, actual[key]) {
 			return false
 		}
@@ -155,6 +158,7 @@ func compareJSONBodies(expected, actual map[string]interface{}) bool {
 			return false
 		}
 	}
+
 	return true
 }
 

internal/acctest/checks.go

@@ -18,14 +18,18 @@ func CheckResourceIDChanged(resourceName string, resourceID *string) resource.Te
 		if resourceID == nil || *resourceID == "" {
 			return errors.New("resourceID was not set")
 		}
+
 		rs, ok := s.RootModule().Resources[resourceName]
 		if !ok {
 			return fmt.Errorf("resource was not found: %s", resourceName)
 		}
+
 		if *resourceID == rs.Primary.ID {
 			return errors.New("resource ID persisted when it should have changed")
 		}
+
 		*resourceID = rs.Primary.ID
+
 		return nil
 	}
 }
@@ -38,10 +42,13 @@ func CheckResourceIDPersisted(resourceName string, resourceID *string) resource.
 		if !ok {
 			return fmt.Errorf("resource was not found: %s", resourceName)
 		}
+
 		if *resourceID != "" && *resourceID != rs.Primary.ID {
 			return errors.New("resource ID changed when it should have persisted")
 		}
+
 		*resourceID = rs.Primary.ID
+
 		return nil
 	}
 }
@@ -82,14 +89,17 @@ func CheckResourceAttrFunc(name string, key string, test func(string) error) res
 		if !ok {
 			return fmt.Errorf("resource not found: %s", name)
 		}
+
 		value, ok := rs.Primary.Attributes[key]
 		if !ok {
 			return fmt.Errorf("key not found: %s", key)
 		}
+
 		err := test(value)
 		if err != nil {
 			return fmt.Errorf("test for %s %s did not pass test: %s", name, key, err)
 		}
+
 		return nil
 	}
 }
@@ -100,6 +110,7 @@ func CheckResourceAttrIPv4(name string, key string) resource.TestCheckFunc {
 		if ip.To4() == nil {
 			return fmt.Errorf("%s is not a valid IPv4", value)
 		}
+
 		return nil
 	})
 }
@@ -110,6 +121,7 @@ func CheckResourceAttrIPv6(name string, key string) resource.TestCheckFunc {
 		if ip.To16() == nil {
 			return fmt.Errorf("%s is not a valid IPv6", value)
 		}
+
 		return nil
 	})
 }
@@ -120,6 +132,7 @@ func CheckResourceAttrIP(name string, key string) resource.TestCheckFunc {
 		if ip == nil {
 			return fmt.Errorf("%s is not a valid IP", value)
 		}
+
 		return nil
 	})
 }

internal/acctest/domain.go

@@ -33,15 +33,18 @@ func init() {
 
 	// check if the test domain is not a Scaleway reserved domain
 	isReserved := false
+
 	for _, reservedDomain := range reservedDomains {
 		if reservedDomain.MatchString(TestDomain) {
 			isReserved = true
+
 			break
 		}
 	}
 
 	if isReserved {
 		logging.L.Warningf("TF_TEST_DOMAIN cannot be a Scaleway required domain. Please use another one.")
+
 		return
 	}
 

internal/acctest/fixtures.go

@@ -64,6 +64,7 @@ func CreateFakeIAMManager(tt *TestTools) (*account.Project, *iam.APIKey, FakeSid
 	iamPolicyName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iam-policy")
 
 	projectAPI := account.NewProjectAPI(tt.Meta.ScwClient())
+
 	project, err := projectAPI.CreateProject(&account.ProjectAPICreateProjectRequest{
 		Name: projectName,
 	})
@@ -74,13 +75,15 @@ func CreateFakeIAMManager(tt *TestTools) (*account.Project, *iam.APIKey, FakeSid
 
 		return nil, nil, nil, err
 	}
+
 	terminateFunctions = append(terminateFunctions, func() error {
 		return projectAPI.DeleteProject(&account.ProjectAPIDeleteProjectRequest{
 			ProjectID: project.ID,
 		})
 	})
 
 	iamAPI := iam.NewAPI(tt.Meta.ScwClient())
+
 	iamApplication, err := iamAPI.CreateApplication(&iam.CreateApplicationRequest{
 		Name: iamApplicationName,
 	})
@@ -91,6 +94,7 @@ func CreateFakeIAMManager(tt *TestTools) (*account.Project, *iam.APIKey, FakeSid
 
 		return nil, nil, nil, err
 	}
+
 	terminateFunctions = append(terminateFunctions, func() error {
 		return iamAPI.DeleteApplication(&iam.DeleteApplicationRequest{
 			ApplicationID: iamApplication.ID,
@@ -114,6 +118,7 @@ func CreateFakeIAMManager(tt *TestTools) (*account.Project, *iam.APIKey, FakeSid
 
 		return nil, nil, nil, err
 	}
+
 	terminateFunctions = append(terminateFunctions, func() error {
 		return iamAPI.DeletePolicy(&iam.DeletePolicyRequest{
 			PolicyID: iamPolicy.ID,
@@ -131,6 +136,7 @@ func CreateFakeIAMManager(tt *TestTools) (*account.Project, *iam.APIKey, FakeSid
 
 		return nil, nil, nil, err
 	}
+
 	terminateFunctions = append(terminateFunctions, func() error {
 		return iamAPI.DeleteAPIKey(&iam.DeleteAPIKeyRequest{
 			AccessKey: iamAPIKey.AccessKey,
@@ -163,6 +169,7 @@ func CreateFakeSideProject(tt *TestTools) (*account.Project, *iam.APIKey, FakeSi
 	iamPolicyName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iam-policy")
 
 	projectAPI := account.NewProjectAPI(tt.Meta.ScwClient())
+
 	project, err := projectAPI.CreateProject(&account.ProjectAPICreateProjectRequest{
 		Name: projectName,
 	})
@@ -173,13 +180,15 @@ func CreateFakeSideProject(tt *TestTools) (*account.Project, *iam.APIKey, FakeSi
 
 		return nil, nil, nil, err
 	}
+
 	terminateFunctions = append(terminateFunctions, func() error {
 		return projectAPI.DeleteProject(&account.ProjectAPIDeleteProjectRequest{
 			ProjectID: project.ID,
 		})
 	})
 
 	iamAPI := iam.NewAPI(tt.Meta.ScwClient())
+
 	iamApplication, err := iamAPI.CreateApplication(&iam.CreateApplicationRequest{
 		Name: iamApplicationName,
 	})
@@ -190,6 +199,7 @@ func CreateFakeSideProject(tt *TestTools) (*account.Project, *iam.APIKey, FakeSi
 
 		return nil, nil, nil, err
 	}
+
 	terminateFunctions = append(terminateFunctions, func() error {
 		return iamAPI.DeleteApplication(&iam.DeleteApplicationRequest{
 			ApplicationID: iamApplication.ID,
@@ -213,6 +223,7 @@ func CreateFakeSideProject(tt *TestTools) (*account.Project, *iam.APIKey, FakeSi
 
 		return nil, nil, nil, err
 	}
+
 	terminateFunctions = append(terminateFunctions, func() error {
 		return iamAPI.DeletePolicy(&iam.DeletePolicyRequest{
 			PolicyID: iamPolicy.ID,
@@ -230,6 +241,7 @@ func CreateFakeSideProject(tt *TestTools) (*account.Project, *iam.APIKey, FakeSi
 
 		return nil, nil, nil, err
 	}
+
 	terminateFunctions = append(terminateFunctions, func() error {
 		return iamAPI.DeleteAPIKey(&iam.DeleteAPIKeyRequest{
 			AccessKey: iamAPIKey.AccessKey,

internal/acctest/sweepers.go

@@ -10,12 +10,14 @@ import (
 
 func Sweep(f func(scwClient *scw.Client) error) error {
 	ctx := context.Background()
+
 	m, err := meta.NewMeta(ctx, &meta.Config{
 		TerraformVersion: "terraform-tests",
 	})
 	if err != nil {
 		return err
 	}
+
 	return f(m.ScwClient())
 }
 
@@ -25,11 +27,13 @@ func SweepZones(zones []scw.Zone, f func(scwClient *scw.Client, zone scw.Zone) e
 		if err != nil {
 			return err
 		}
+
 		err = f(client, zone)
 		if err != nil {
 			logging.L.Warningf("error running sweepZones, ignoring: %s", err)
 		}
 	}
+
 	return nil
 }
 
@@ -41,6 +45,7 @@ func SweepRegions(regions []scw.Region, f func(scwClient *scw.Client, region scw
 
 	return SweepZones(zones, func(scwClient *scw.Client, zone scw.Zone) error {
 		r, _ := zone.Region()
+
 		return f(scwClient, r)
 	})
 }
@@ -49,12 +54,14 @@ func SweepRegions(regions []scw.Region, f func(scwClient *scw.Client, region scw
 // functions for a given zone
 func sharedClientForZone(zone scw.Zone) (*scw.Client, error) {
 	ctx := context.Background()
+
 	m, err := meta.NewMeta(ctx, &meta.Config{
 		TerraformVersion: "terraform-tests",
 		ForceZone:        zone,
 	})
 	if err != nil {
 		return nil, err
 	}
+
 	return m.ScwClient(), nil
 }

internal/acctest/validate_cassettes_test.go

@@ -34,12 +34,15 @@ func exceptionsCassettesCases() map[string]struct{} {
 func getTestFiles() (map[string]struct{}, error) {
 	filesMap := make(map[string]struct{})
 	exceptions := exceptionsCassettesCases()
+
 	err := filepath.WalkDir("../services", func(path string, _ fs.DirEntry, _ error) error {
 		isCassette := strings.Contains(path, "cassette")
 		_, isException := exceptions[path]
+
 		if isCassette && !isException {
 			filesMap[fileNameWithoutExtSuffix(path)] = struct{}{}
 		}
+
 		return nil
 	})
 	if err != nil {
@@ -73,6 +76,7 @@ func checkErrorCode(c *cassette.Cassette) error {
 
 func checkErrCodeExcept(i *cassette.Interaction, c *cassette.Cassette, codes ...int) bool {
 	exceptions := exceptionsCassettesCases()
+
 	_, isException := exceptions[c.File]
 	if isException {
 		return isException
@@ -81,14 +85,17 @@ func checkErrCodeExcept(i *cassette.Interaction, c *cassette.Cassette, codes ...
 	if strings.Contains(i.Response.Body, mnq.AWSErrNonExistentQueue) && i.Response.Code == 400 {
 		return true
 	}
+
 	if i.Response.Code >= 400 {
 		for _, httpCode := range codes {
 			if i.Response.Code == httpCode {
 				return true
 			}
 		}
+
 		return false
 	}
+
 	return true
 }