fix(tftemplate): fix generation

cmd/tftemplate/datasource.go.tmpl

@@ -1,25 +1,27 @@
 {{- /*gotype: tftemplate/models.ResourceTemplate*/ -}}
-package scaleway
+package {{.API}}
 
 import (
     "context"
 
     "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
     "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+    "github.com/scaleway/terraform-provider-scaleway/v2/internal/datasource"
+    "github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 )
 
 func DataSource{{.Resource}}() *schema.Resource {
     // Generate datasource schema from resource
-    dsSchema := datasourceSchemaFromResourceSchema(Resource{{.Resource}}().Schema)
+    dsSchema := datasource.SchemaFromResourceSchema(Resource{{.Resource}}().Schema)
 
-    addOptionalFieldsToSchema(dsSchema, "name", "{{.Locality}}")
+    datasource.AddOptionalFieldsToSchema(dsSchema, "name", "{{.Locality}}")
 
     dsSchema["{{.ResourceCleanLow}}_id"] = &schema.Schema{
         Type:          schema.TypeString,
         Optional:      true,
         Description:   "The ID of the {{.ResourceCleanLow}}",
         ConflictsWith: []string{"name"},
-        ValidateFunc:  validationUUIDorUUIDWithLocality(),
+        ValidateFunc:  verify.IsUUIDorUUIDWithLocality(),
     }
     dsSchema["project_id"].Optional = true
 
@@ -30,49 +32,42 @@ func DataSource{{.Resource}}() *schema.Resource {
 }
 
 func DataSource{{.Resource}}Read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-    api, {{.Locality}}, err := {{.API}}APIWith{{.LocalityUpper}}(d, m)
+    api, {{.Locality}}, err := newAPIWith{{.LocalityUpper}}(d, m)
     if err != nil {
         return diag.FromErr(err)
     }
 
     {{.ResourceCleanLow}}ID, {{.ResourceCleanLow}}IDExists := d.GetOk("{{.ResourceCleanLow}}_id")
     if !{{.ResourceCleanLow}}IDExists {
+        {{.ResourceCleanLow}}Name := d.Get("name").(string)
         res, err := api.List{{.ResourceClean}}s(&{{.API}}.List{{.ResourceClean}}sRequest{
             {{.LocalityUpper}}:     {{.Locality}},
             Name:       types.ExpandStringPtr(d.Get("name")),
-            ProjectID:  types.ExpandStringPtr(d.Get("project_id")),
         })
         if err != nil {
             return diag.FromErr(err)
         }
-        for _, {{.ResourceCleanLow}} := range res.{{.ResourceClean}}s {
-            if {{.ResourceCleanLow}}.Name == d.Get("name").(string) {
-                if {{.ResourceCleanLow}}ID != "" {
-                    return diag.Errorf("more than 1 {{.ResourceCleanLow}} found with the same name %s", d.Get("name"))
-                }
-                {{.ResourceCleanLow}}ID = {{.ResourceCleanLow}}.ID
-            }
-        }
-        if {{.ResourceCleanLow}}ID == "" {
-            return diag.Errorf("no {{.ResourceCleanLow}} found with the name %s", d.Get("name"))
+        found{{.ResourceClean}} , err := datasource.FindExact(
+            res.{{.ResourceClean}}s,
+            func(s *{{.API}}.{{.ResourceClean}}) bool {return s.Name == {{.ResourceCleanLow}}Name },
+            {{.ResourceCleanLow}}Name,
+        )
+        if err != nil {
+            return diag.FromErr(err)
         }
+        {{.ResourceCleanLow}}ID = found{{.ResourceClean}}.ID
     }
 
-    {{.Locality}}ID := datasourceNew{{.LocalityAdjectiveUpper}}ID({{.ResourceCleanLow}}ID, {{.Locality}})
+	{{- if eq .Locality "zone" }}
+    {{.Locality}}ID := datasource.NewZonedID({{.ResourceCleanLow}}ID, {{.Locality}})
+    {{- else }}
+    {{.Locality}}ID := datasource.New{{.LocalityAdjectiveUpper}}ID({{.ResourceCleanLow}}ID, {{.Locality}})
+	{{- end}}
     d.SetId({{.Locality}}ID)
     err = d.Set("{{.ResourceCleanLow}}_id", {{.Locality}}ID)
     if err != nil {
         return diag.FromErr(err)
     }
 
-    diags := Resource{{.Resource}}Read(ctx, d, m)
-    if diags != nil {
-        return append(diags, diag.Errorf("failed to read {{.ResourceCleanLow}} state")...)
-    }
-
-    if d.Id() == "" {
-        return diag.Errorf("{{.ResourceCleanLow}} (%s) not found", {{.Locality}}ID)
-    }
-
-    return nil
+    return Resource{{.Resource}}Read(ctx, d, m)
 }

cmd/tftemplate/datasource_test.go.tmpl

@@ -1,5 +1,5 @@
 {{- /*gotype: tftemplate/models.ResourceTemplate*/ -}}
-package scaleway
+package {{.API}}_test
 
 import (
 	"testing"

cmd/tftemplate/go.mod

@@ -8,10 +8,11 @@ require github.com/AlecAivazis/survey/v2 v2.3.7
 
 require (
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/mattn/go-colorable v0.1.2 // indirect
-	github.com/mattn/go-isatty v0.0.8 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	github.com/stretchr/testify v1.7.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
 )

cmd/tftemplate/go.sum

@@ -11,17 +11,21 @@ github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -36,16 +40,20 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

cmd/tftemplate/helpers.go.tmpl

@@ -1,16 +1,16 @@
 {{- /*gotype: tftemplate/models.ResourceTemplate*/ -}}
-package scaleway
+package {{.API}}
 
 import (
     "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
     "github.com/scaleway/scaleway-sdk-go/scw"
 )
 
-// {{.API}}APIWith{{.LocalityUpper}} returns a new {{.API}} API and the {{.Locality}} for a Create request
+// 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) {
     {{.API}}API := {{.API}}.NewAPI(meta.ExtractScwClient(m))
 
-    {{.Locality}}, err := extract{{.LocalityUpper}}(d, m)
+    {{.Locality}}, err := meta.Extract{{.LocalityUpper}}(d, m)
     if err != nil {
         return nil, "", err
     }
@@ -22,7 +22,7 @@ func {{.API}}APIWith{{.LocalityUpper}}(d *schema.ResourceData, m interface{}) (*
 func {{.API}}APIWith{{.LocalityUpper}}AndID(m interface{}, {{.LocalityAdjective}}ID string) (*{{.API}}.API, scw.{{.LocalityUpper}}, string, error) {
     {{.API}}API := {{.API}}.NewAPI(meta.ExtractScwClient(m))
 
-    {{.Locality}}, ID, err := parse{{.LocalityAdjectiveUpper}}ID({{.LocalityAdjective}}ID)
+    {{.Locality}}, ID, err := {{.LocalityAdjective}}.ParseID({{.LocalityAdjective}}ID)
     if err != nil {
         return nil, "", "", err
     }

cmd/tftemplate/main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"text/template"
+
 	"tftemplate/models"
 
 	"github.com/AlecAivazis/survey/v2"
@@ -54,14 +55,14 @@ var resourceQS = []*survey.Question{
 	{
 		Name: "helpers",
 		Prompt: &survey.Confirm{
-			Message: "Generate helpers ? Will override scaleway/helpers_{api}.go",
+			Message: "Generate helpers ? Will override ../../internal/services/{api}/helpers_{api}.go",
 			Default: false,
 		},
 	},
 	{
 		Name: "waiters",
 		Prompt: &survey.Confirm{
-			Message: "Generate waiters ? Will be added to scaleway/helpers_{api}.go",
+			Message: "Generate waiters ? Will be added to ../../internal/services/{api}/waiter.go",
 			Default: true,
 		},
 	},
@@ -95,32 +96,32 @@ func main() {
 
 	templates := []*TerraformTemplate{
 		{
-			FileName:     fmt.Sprintf("../../scaleway/resource_%s.go", resourceData.ResourceHCL),
+			FileName:     fmt.Sprintf("../../internal/services/%s/%s.go", resourceData.API, resourceData.ResourceHCL),
 			TemplateFile: resourceTemplateFile,
 			Skip:         !contains(resourceInput.Targets, "resource"),
 		},
 		{
-			FileName:     fmt.Sprintf("../../scaleway/resource_%s_test.go", resourceData.ResourceHCL),
+			FileName:     fmt.Sprintf("../../internal/services/%s/%s_test.go", resourceData.API, resourceData.ResourceHCL),
 			TemplateFile: resourceTestTemplateFile,
 			Skip:         !contains(resourceInput.Targets, "resource"),
 		},
 		{
-			FileName:     fmt.Sprintf("../../scaleway/data_source_%s.go", resourceData.ResourceHCL),
+			FileName:     fmt.Sprintf("../../internal/services/%s/%s_data_source.go", resourceData.API, resourceData.ResourceHCL),
 			TemplateFile: datasourceTemplateFile,
 			Skip:         !contains(resourceInput.Targets, "datasource"),
 		},
 		{
-			FileName:     fmt.Sprintf("../../scaleway/data_source_%s_test.go", resourceData.ResourceHCL),
+			FileName:     fmt.Sprintf("../../internal/services/%s/data_source_%s_test.go", resourceData.API, resourceData.ResourceHCL),
 			TemplateFile: datasourceTestTemplateFile,
 			Skip:         !contains(resourceInput.Targets, "datasource"),
 		},
 		{
-			FileName:     fmt.Sprintf("../../scaleway/helpers_%s.go", resourceData.API),
+			FileName:     fmt.Sprintf("../../internal/services/%s/helpers_%s.go", resourceData.API, resourceData.API),
 			TemplateFile: resourceHelpersTemplateFile,
 			Skip:         !resourceInput.Helpers,
 		},
 		{
-			FileName:     fmt.Sprintf("../../scaleway/helpers_%s.go", resourceData.API),
+			FileName:     fmt.Sprintf("../../internal/services/%s/waiter.go", resourceData.API),
 			TemplateFile: resourceWaitersTemplateFile,
 			Skip:         !resourceInput.Waiters,
 			Append:       true,

cmd/tftemplate/models/resource.go

@@ -1,20 +1,24 @@
 package models
 
 import (
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 	"strings"
 	"unicode"
 )
 
 type ResourceTemplate struct {
-	LocalityAdjectiveUpper string // Regional/Zoned
-	LocalityAdjective      string // regional/zoned
-	LocalityUpper          string // Region
-	Locality               string // region
-	Resource               string // FunctionNamespace
-	ResourceClean          string // Namespace
-	ResourceCleanLow       string // namespace
-	ResourceHCL            string // function_namespace
-	API                    string // function
+	LocalityAdjectiveUpper  string // Regional/Zoned
+	LocalityAdjective       string // regional/zoned
+	LocalityUpper           string // Region
+	Locality                string // region
+	Resource                string // FunctionNamespace
+	ResourceClean           string // Namespace
+	ResourceCleanLow        string // namespace
+	ResourceFistLetterUpper string
+	ResourceHCL             string // function_namespace
+	API                     string // function
+	APIFirstLetterUpper     string // Function
 
 	SupportWaiters bool // If resource have waiters
 }
@@ -24,6 +28,11 @@ func isUpper(letter uint8) bool {
 	return unicode.IsUpper(r) || unicode.IsDigit(r)
 }
 
+func FirstLetterUpper(string string) string {
+	capitalized := cases.Title(language.English).String(string)
+	return capitalized
+}
+
 // splitByWord split a resource name to words
 // ex: FunctionNamespace, K8SCluster, IamSSHKey
 func splitByWord(sentence string) []string {
@@ -81,7 +90,7 @@ func resourceWordsLower(resource string) []string {
 func adjectiveLocality(locality string) string {
 	switch locality {
 	case "zone":
-		return "zoned"
+		return "zonal"
 	case "region":
 		return "regional"
 	}
@@ -103,5 +112,6 @@ func NewResourceTemplate(api string, resource string, locality string) ResourceT
 		ResourceCleanLow:       cleanResource(api, resource, false),
 		ResourceHCL:            strings.Join(resourceWordsLower(resource), "_"),
 		API:                    api,
+		APIFirstLetterUpper:    FirstLetterUpper(api),
 	}
 }