Merge branch 'master' into chore/bump_sdk_go

Author: jremy42

.github/workflows/acceptance-tests.yaml

@@ -18,19 +18,20 @@ jobs:
           - block
           - cockpit
           - container
-          - documentdb
           - domain
           - flexibleip
           - function
           - iam
           - instance
+          - inference
           - iot
           - ipam
           - jobs
           - k8s
           - lb
           - marketplace
           - mnq
+          - mongodb
           - object
           - rdb
           - redis

.github/workflows/coverage.yml

@@ -26,4 +26,4 @@ jobs:
           SCW_ACCESS_KEY: "SCWXXXXXXXXXXXXXFAKE"
           SCW_SECRET_KEY: "11111111-1111-1111-1111-111111111111"
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5

.github/workflows/nightly.yml

@@ -19,11 +19,11 @@ jobs:
           - block
           - cockpit
           - container
-          - documentdb
           - domain
           - flexibleip
           - function
           - iam
+          - inference
           - instance
           - iot
           - ipam
@@ -32,6 +32,7 @@ jobs:
           - lb
           - marketplace
           - mnq
+          - mongodb
           - object
           - rdb
           - redis

.golangci.yml

@@ -34,6 +34,7 @@ linters:
     - goprintffuncname # Checks that printf-like functions are named with `f` at the end [fast: true, auto-fix: false]
     - gosec #(gas): Inspects source code for security problems [fast: false, auto-fix: false]
     - gosimple #(megacheck): Linter for Go source code that specializes in simplifying a code [fast: false, auto-fix: false]
+    - gosmopolitan # Report certain i18n/l10n anti-patterns in your Go codebase [fast: false, auto-fix: false]
     - govet #(vet, vetshadow): Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string [fast: false, auto-fix: false]
     - grouper # An analyzer to analyze expression groups. [fast: true, auto-fix: false]
     - importas # Enforces consistent import aliases [fast: false, auto-fix: false]
@@ -62,6 +63,7 @@ linters:
     - sqlclosecheck # Checks that sql.Rows and sql.Stmt are closed. [fast: false, auto-fix: false]
     - staticcheck #(megacheck): Staticcheck is a go vet on steroids, applying a ton of static analysis checks [fast: false, auto-fix: false]
     - stylecheck # Stylecheck is a replacement for golint [fast: false, auto-fix: false]
+    - tagalign # check that struct tags are well aligned [fast: true, auto-fix: true]
     - tagliatelle # Checks the struct tags. [fast: true, auto-fix: false]
     - tenv # tenv is analyzer that detects using os.Setenv instead of t.Setenv since Go1.17 [fast: false, auto-fix: false]
     - testifylint # Checks usage of github.com/stretchr/testify. [fast: false, auto-fix: false]
@@ -80,8 +82,8 @@ linters:
     - cyclop # checks function and package cyclomatic complexity [fast: false, auto-fix: false]
     - depguard # Go linter that checks if package imports are in a list of acceptable packages [fast: true, auto-fix: false]
     - dupl # Tool for code clone detection [fast: true, auto-fix: false]
+    - err113 # Golang linter to check the errors handling expressions [fast: false, auto-fix: false]
     - errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13. [fast: false, auto-fix: false]
-    - execinquery # execinquery is a linter about query string checker in Query function which reads your Go src files and warning it finds [fast: false, auto-fix: false]
     - exhaustive # check exhaustiveness of enum switch statements [fast: false, auto-fix: false]
     - forcetypeassert # finds forced type assertions [fast: true, auto-fix: false]
     - funlen # Tool for detection of long functions [fast: true, auto-fix: false]
@@ -90,10 +92,9 @@ linters:
     - gocognit # Computes and checks the cognitive complexity of functions [fast: true, auto-fix: false]
     - godot # Check if comments end in a period [fast: true, auto-fix: true]
     - godox # Tool for detection of FIXME, TODO and other comment keywords [fast: true, auto-fix: false]
-    - err113 # Golang linter to check the errors handling expressions [fast: false, auto-fix: false]
-    - gomnd # An analyzer to detect magic numbers. [fast: true, auto-fix: false]
     - lll # Reports long lines [fast: true, auto-fix: false]
     - maintidx # maintidx measures the maintainability index of each function. [fast: true, auto-fix: false]
+    - 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]

cmd/tftemplate/helpers.go.tmpl

@@ -6,8 +6,8 @@ import (
     "github.com/scaleway/scaleway-sdk-go/scw"
 )
 
-// newAPIWith{{.LocalityUpper}} returns a new {{.API}} API and the {{.Locality}} for a Create request
-func {{.API}}APIWith{{.LocalityUpper}}(d *schema.ResourceData, m interface{}) (*{{.API}}.API, scw.{{.LocalityUpper}}, error) {
+// NewAPIWith{{.LocalityUpper}} returns a new {{.API}} API and the {{.Locality}} for a Create request
+func NewAPIWith{{.LocalityUpper}}(d *schema.ResourceData, m interface{}) (*{{.API}}.API, scw.{{.LocalityUpper}}, error) {
     {{.API}}API := {{.API}}.NewAPI(meta.ExtractScwClient(m))
 
     {{.Locality}}, err := meta.Extract{{.LocalityUpper}}(d, m)
@@ -18,8 +18,8 @@ func {{.API}}APIWith{{.LocalityUpper}}(d *schema.ResourceData, m interface{}) (*
     return {{.API}}API, {{.Locality}}, nil
 }
 
-// {{.API}}APIWith{{.LocalityAdjectiveUpper}}AndID returns a new {{.API }} API with {{.Locality}} and ID extracted from the state
-func {{.API}}APIWith{{.LocalityUpper}}AndID(m interface{}, {{.LocalityAdjective}}ID string) (*{{.API}}.API, scw.{{.LocalityUpper}}, string, error) {
+// NewAPIWith{{.LocalityUpper}}AndID returns a new {{.API }} API with {{.Locality}} and ID extracted from the state
+func NewAPIWith{{.LocalityUpper}}AndID(m interface{}, {{.LocalityAdjective}}ID string) (*{{.API}}.API, scw.{{.LocalityUpper}}, string, error) {
     {{.API}}API := {{.API}}.NewAPI(meta.ExtractScwClient(m))
 
     {{.Locality}}, ID, err := {{.LocalityAdjective}}.ParseID({{.LocalityAdjective}}ID)

cmd/tftemplate/main.go

@@ -24,6 +24,10 @@ var (
 	datasourceTemplateFile string
 	//go:embed datasource_test.go.tmpl
 	datasourceTestTemplateFile string
+	//go:embed sweep_test.go.tmpl
+	resourceSweepTemplateFile string
+	//go:embed sweep.go.tmpl
+	resourceSweepTestTemplateFile string
 )
 
 var resourceQS = []*survey.Question{
@@ -66,6 +70,13 @@ var resourceQS = []*survey.Question{
 			Default: true,
 		},
 	},
+	{
+		Name: "sweep",
+		Prompt: &survey.Confirm{
+			Message: "Generate sweeper ? Will be added to ../../internal/services/{api}/sweep.go",
+			Default: true,
+		},
+	},
 }
 
 func contains[T comparable](slice []T, expected T) bool {
@@ -86,6 +97,7 @@ func main() {
 		Locality string
 		Helpers  bool
 		Waiters  bool
+		Sweep    bool
 	}{}
 	err := survey.Ask(resourceQS, &resourceInput)
 	if err != nil {
@@ -126,6 +138,18 @@ func main() {
 			Skip:         !resourceInput.Waiters,
 			Append:       true,
 		},
+		{
+			FileName:     fmt.Sprintf("../../internal/services/%s/testfuncs/sweep.go", resourceData.API),
+			TemplateFile: resourceSweepTemplateFile,
+			Skip:         !contains(resourceInput.Targets, "resource"),
+			Append:       true,
+		},
+		{
+			FileName:     fmt.Sprintf("../../internal/services/%s/sweep_test.go", resourceData.API),
+			TemplateFile: resourceSweepTestTemplateFile,
+			Skip:         !contains(resourceInput.Targets, "resource"),
+			Append:       true,
+		},
 	}
 
 	for _, tmpl := range templates {

cmd/tftemplate/models/resource.go

@@ -1,10 +1,11 @@
 package models
 
 import (
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
 	"strings"
 	"unicode"
+
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
 type ResourceTemplate struct {

cmd/tftemplate/resource.go.tmpl

@@ -49,7 +49,7 @@ func Resource{{ .Resource }}Create(ctx context.Context, d *schema.ResourceData,
 
 	req := &{{ .API }}.Create{{ .ResourceClean }}Request{
 			{{.LocalityUpper}}: {{.Locality}},
-			ProjectID: types.ExpandStringPtr(d.Get("project_id").(string)),
+			ProjectID: d.Get("project_id").(string),
 			Name: types.ExpandOrGenerateString(d.Get("name").(string), "{{ .ResourceCleanLow }}"),
 	}
 
@@ -71,7 +71,7 @@ func Resource{{ .Resource }}Create(ctx context.Context, d *schema.ResourceData,
 }
 
 func Resource{{ .Resource }}Read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	api, id, zone, err := NewAPIWith{{ .LocalityUpper }}AndID(m, d.Id())
+	api,{{.Locality}}, id, err := newAPIWith{{ .LocalityUpper }}AndID(m, d.Id())
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -101,7 +101,7 @@ func Resource{{ .Resource }}Read(ctx context.Context, d *schema.ResourceData, m
 }
 
 func Resource{{ .Resource }}Update(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	api, {{ .Locality }}, id, err := NewAPIWith{{ .LocalityUpper }}AndID(m, d.Id())
+	api, {{ .Locality }}, id, err := newAPIWith{{ .LocalityUpper }}AndID(m, d.Id())
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -132,7 +132,7 @@ func Resource{{ .Resource }}Update(ctx context.Context, d *schema.ResourceData,
 }
 
 func Resource{{ .Resource }}Delete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	api, {{ .Locality }}, id, err := NewAPIWith{{ .LocalityUpper }}AndID(m, d.Id())
+	api, {{ .Locality }}, id, err := newAPIWith{{ .LocalityUpper }}AndID(m, d.Id())
 	if err != nil {
 		return diag.FromErr(err)
 	}

cmd/tftemplate/resource_test.go.tmpl

@@ -1,5 +1,5 @@
 {{- /*gotype: tftemplate/models.ResourceTemplate*/ -}}
-package scaleway
+package {{.API}}_test
 
 import (
 	"fmt"
@@ -10,74 +10,40 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
-func init() {
-	resource.AddTestSweepers("scaleway_{{ .ResourceHCL }}", &resource.Sweeper{
-		Name: "scaleway_{{ .ResourceHCL }}",
-		F:    testSweep{{ .Resource }},
-	})
-}
-
-func testSweep{{ .Resource }}(_ string) error {
-	return sweep{{.LocalityUpper}}s((&{{ .API }}.API{}).{{ .LocalityUpper }}s(), func(scwClient *scw.Client, {{ .Locality }} scw.{{.LocalityUpper}}) error {
-		{{ .API }}API := {{ .API }}.NewAPI(scwClient)
-		l.Debugf("sweeper: destroying the {{ .API }} {{ .ResourceCleanLow }}s in (%s)", {{.Locality}})
-		list{{.ResourceClean}}s, err := {{.API}}API.List{{.ResourceClean}}s(
-			&{{.API}}.List{{.ResourceClean}}sRequest{
-				{{.LocalityUpper}}: {{.Locality}},
-			}, scw.WithAllPages())
-		if err != nil {
-			return fmt.Errorf("error listing {{.ResourceCleanLow}} in (%s) in sweeper: %s", {{.Locality}}, err)
-		}
 
-		for _, {{.ResourceCleanLow}} := range list{{.ResourceClean}}s.{{.ResourceClean}}s {
-			_, err := {{.API}}API.Delete{{.ResourceClean}}(&{{.API}}.Delete{{.ResourceClean}}Request{
-				{{.ResourceClean}}ID: {{.ResourceCleanLow}}.ID,
-				{{.LocalityUpper}}:      {{.Locality}},
-			})
-			if err != nil {
-				l.Debugf("sweeper: error (%s)", err)
-
-				return fmt.Errorf("error deleting {{.ResourceCleanLow}} in sweeper: %s", err)
-			}
-		}
-
-		return nil
-	})
-}
 
 func TestAcc{{.Resource}}_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
 		CheckDestroy:      testAccCheck{{.Resource}}Destroy(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
-					resource scaleway_{{.ResourceHCL}} main {
+					resource "scaleway_{{.API}}_{{.ResourceHCL}}" "main" {
 						name = "test-{{.API}}-{{ .ResourceCleanLow}}-basic"
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheck{{.Resource}}Exists(tt, "scaleway_{{.ResourceHCL}}.main"),
-					testCheckResourceAttrUUID("scaleway_{{.ResourceHCL}}.main", "id"),
-					resource.TestCheckResourceAttr("scaleway_{{.ResourceHCL}}.main", "name", "test-{{.API}}-{{ .ResourceCleanLow}}-basic"),
+					testAccCheck{{.Resource}}Exists(tt, "scaleway_{{.API}}_{{.ResourceHCL}}.main"),
+					resource.TestCheckResourceAttr("scaleway_{{.API}}_{{.ResourceHCL}}.main", "name", "test-{{.API}}-{{ .ResourceCleanLow}}-basic"),
 				),
 			},
 		},
 	})
 }
 
-func testAccCheck{{.Resource}}Exists(tt *TestTools, n string) resource.TestCheckFunc {
+func testAccCheck{{.Resource}}Exists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		rs, ok := state.RootModule().Resources[n]
 		if !ok {
 			return fmt.Errorf("resource not found: %s", n)
 		}
 
-		api, {{.Locality}}, id, err := {{.API}}APIWith{{.LocalityUpper}}AndID(tt.Meta, rs.Primary.ID)
+		api, {{.Locality}}, id, err := newAPIWith{{.LocalityUpper}}AndID(tt.Meta, rs.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -95,14 +61,14 @@ func testAccCheck{{.Resource}}Exists(tt *TestTools, n string) resource.TestCheck
 	}
 }
 
-func testAccCheck{{.Resource}}Destroy(tt *TestTools) resource.TestCheckFunc {
+func testAccCheck{{.Resource}}Destroy(tt *acctest.TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		for _, rs := range state.RootModule().Resources {
-			if rs.Type != "scaleway_{{.ResourceHCL}}" {
+			if rs.Type != "scaleway_{{.API}}_{{.ResourceHCL}}" {
 				continue
 			}
 
-			api, {{.Locality}}, id, err := {{.API}}APIWith{{.LocalityUpper}}AndID(tt.Meta, rs.Primary.ID)
+			api, {{.Locality}}, id, err := newAPIWith{{.LocalityUpper}}AndID(tt.Meta, rs.Primary.ID)
 			if err != nil {
 				return err
 			}
@@ -116,7 +82,7 @@ func testAccCheck{{.Resource}}Destroy(tt *TestTools) resource.TestCheckFunc {
 				return fmt.Errorf("{{.API}} {{.ResourceCleanLow}} (%s) still exists", rs.Primary.ID)
 			}
 
-			if !is404Error(err) {
+			if !httperrors.Is404(err) {
 				return err
 			}
 		}

cmd/tftemplate/sweep.go.tmpl

@@ -0,0 +1,39 @@
+{{- /*gotype: tftemplate/models.ResourceTemplate*/ -}}
+package {{.API}}testfuncs
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/scaleway/scaleway-sdk-go/scw"
+)
+
+func testSweep{{ .Resource }}(_ string) error {
+	return acctest.Sweep{{.LocalityUpper}}s((&{{ .API }}.API{}).{{ .LocalityUpper }}s(), func(scwClient *scw.Client, {{ .Locality }} scw.{{.LocalityUpper}}) error {
+		{{ .API }}API := {{ .API }}.NewAPI(scwClient)
+		logging.L.Debugf("sweeper: destroying the {{ .API }} {{ .ResourceCleanLow }}s in (%s)", {{.Locality}})
+		list{{.ResourceClean}}s, err := {{.API}}API.List{{.ResourceClean}}s(
+			&{{.API}}.List{{.ResourceClean}}sRequest{
+				{{.LocalityUpper}}: {{.Locality}},
+			}, scw.WithAllPages())
+		if err != nil {
+			return fmt.Errorf("error listing {{.ResourceCleanLow}} in (%s) in sweeper: %s", {{.Locality}}, err)
+		}
+
+		for _, {{.ResourceCleanLow}} := range list{{.ResourceClean}}s.{{.ResourceClean}}s {
+			_, err := {{.API}}API.Delete{{.ResourceClean}}(&{{.API}}.Delete{{.ResourceClean}}Request{
+				{{.ResourceClean}}ID: {{.ResourceCleanLow}}.ID,
+				{{.LocalityUpper}}:      {{.Locality}},
+			})
+			if err != nil {
+				logging.L.Debugf("sweeper: error (%s)", err)
+
+				return fmt.Errorf("error deleting {{.ResourceCleanLow}} in sweeper: %s", err)
+			}
+		}
+
+		return nil
+	})
+}