merge

Author: sfc-gh-fbudzynski

pkg/sdk/poc/generator/show_object_methods.go

@@ -1,33 +1,31 @@
 package generator
 
 import (
-	"fmt"
 	"log"
 	"slices"
 )
 
-
-type ShowObjectMethod struct {
-	Name        string
-	StructName  string
-	ReturnValue string
-	ReturnType  string
-}
-
 type ShowObjectIdMethod struct {
-
+	StructName     string
+	IdentifierKind objectIdentifierKind
+	Args           []string
 }
 
-func newShowObjectMethod(name, structName, returnValue string, returnType string) *ShowObjectMethod {
-	return &ShowObjectMethod{
-		Name:        name,
-		StructName:  structName,
-		ReturnValue: returnValue,
-		ReturnType:  returnType,
+func newShowObjectIDMethod(structName string, idType objectIdentifierKind) *ShowObjectIdMethod {
+	return &ShowObjectIdMethod{
+		StructName:     structName,
+		IdentifierKind: idType,
+		Args:           idTypeParts[idType],
 	}
 }
 
-func checkRequiredFieldsForIDMethod(structName string, helperStructs []*Field, idKind objectIdentifierKind) bool {
+var idTypeParts map[objectIdentifierKind][]string = map[objectIdentifierKind][]string{
+	AccountObjectIdentifier:  {"Name"},
+	DatabaseObjectIdentifier: {"DatabaseName", "Name"},
+	SchemaObjectIdentifier:   {"DatabaseName", "SchemaName", "Name"},
+}
+
+func checkRequiredFieldsForIdMethod(structName string, helperStructs []*Field, idKind objectIdentifierKind) bool {
 	if requiredFields, ok := idTypeParts[idKind]; ok {
 		for _, field := range helperStructs {
 			if field.Name == structName {
@@ -39,12 +37,6 @@ func checkRequiredFieldsForIDMethod(structName string, helperStructs []*Field, i
 	return false
 }
 
-var idTypeParts map[objectIdentifierKind][]string = map[objectIdentifierKind][]string{
-	AccountObjectIdentifier:  {"Name"},
-	DatabaseObjectIdentifier: {"DatabaseName", "Name"},
-	SchemaObjectIdentifier:   {"DatabaseName", "SchemaName", "Name"},
-}
-
 func containsFieldNames(fields []*Field, names ...string) bool {
 	fieldNames := []string{}
 	for _, field := range fields {
@@ -59,17 +51,10 @@ func containsFieldNames(fields []*Field, names ...string) bool {
 	return true
 }
 
-func newShowObjectIDMethod(structName string, idType objectIdentifierKind) *ShowObjectMethod {
-	requiredFields := idTypeParts[idType]
-	var args string
-	for _, field := range requiredFields {
-		args += fmt.Sprintf("v.%v, ", field)
-	}
-
-	returnValue := fmt.Sprintf("New%v(%v)", idType, args)
-	return newShowObjectMethod("ID", structName, returnValue, string(idType))
+type ShowObjectTypeMethod struct {
+	StructName string
 }
 
-func newShowObjectTypeMethod(structName string) *ShowObjectMethod {
-	return newShowObjectMethod("ObjectType", structName, "ObjectType"+structName, "ObjectType")
+func newShowObjectTypeMethod(structName string) *ShowObjectTypeMethod {
+	return &ShowObjectTypeMethod{StructName: structName}
 }

pkg/sdk/poc/generator/template_executors.go

@@ -27,18 +27,21 @@ func GenerateInterface(writer io.Writer, def *Interface) {
 			if err != nil {
 				log.Printf("[WARN] for showObjectIdMethod: %v", err)
 			}
-			if checkRequiredFieldsForIDMethod(def.NameSingular, o.HelperStructs, idKind) {
-				generateShowObjectMethods(writer, newShowObjectIDMethod(def.NameSingular, idKind))
+			if checkRequiredFieldsForIdMethod(def.NameSingular, o.HelperStructs, idKind) {
+				generateShowObjectIdMethod(writer, newShowObjectIDMethod(def.NameSingular, idKind))
 			}
 
-			generateShowObjectMethods(writer, newShowObjectTypeMethod(def.NameSingular))
+			generateShowObjectTypeMethod(writer, newShowObjectTypeMethod(def.NameSingular))
 		}
-
 	}
 }
 
-func generateShowObjectMethods(writer io.Writer, hm *ShowObjectMethod) {
-	printTo(writer, ShowObjectMethodTemplate, hm)
+func generateShowObjectIdMethod(writer io.Writer, m *ShowObjectIdMethod) {
+	printTo(writer, ShowObjectIdMethodTemplate, m)
+}
+
+func generateShowObjectTypeMethod(writer io.Writer, m *ShowObjectTypeMethod) {
+	printTo(writer, ShowObjectTypeMethodTemplate, m)
 }
 
 func generateOptionsStruct(writer io.Writer, operation *Operation) {

pkg/sdk/poc/generator/templates.go

@@ -28,6 +28,14 @@ var (
 	showObjectMethodTemplateContent string
 	ShowObjectMethodTemplate, _     = template.New("helperMethodTemplate").Parse(showObjectMethodTemplateContent)
 
+	//go:embed templates/show_object_id_method.tmpl
+	showObjectIdMethodTemplateContent string
+	ShowObjectIdMethodTemplate, _     = template.New("showObjectIdMethodTemplate").Parse(showObjectIdMethodTemplateContent)
+
+	//go:embed templates/show_object_type_method.tmpl
+	showObjectTypeMethodTemplateContent string
+	ShowObjectTypeMethodTemplate, _     = template.New("showObjectTypeMethodTemplate").Parse(showObjectTypeMethodTemplateContent)
+
 	//go:embed templates/dto_declarations.tmpl
 	dtoDeclarationsTemplateContent string
 	DtoTemplate, _                 = template.New("dtoTemplate").Parse(dtoDeclarationsTemplateContent)

pkg/sdk/poc/generator/templates/show_object_id_method.tmpl

@@ -1,5 +1,5 @@
-{{- /*gotype: github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/poc/generator.ShowObjectMethod*/ -}}
+{{- /*gotype: github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/poc/generator.ShowObjectIdMethod*/ -}}
 
 func (v *{{ .StructName }}) ID() {{ .IdentifierKind }} {
-    return New{{ .IdentifierKind }}({{ range .Args }}v.{{ .Name }}, {{ end }})
+    return New{{ .IdentifierKind }}({{ range .Args }}v.{{ . }}, {{ end }})
 }

pkg/sdk/poc/generator/templates/show_object_type_method.tmpl

@@ -0,0 +1,5 @@
+{{- /*gotype: github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/poc/generator.ShowObjectTypeMethod*/ -}}
+
+func (v *{{ .StructName }}) ObjectType() ObjectType {
+    return ObjectType{{ .StructName }}
+}

pkg/sdk/secrets_def.go

@@ -241,8 +241,6 @@ var SecretsDef = g.NewInterface(
 		SQL("SECRETS").
 		OptionalLike().
 		OptionalExtendedIn(),
-	g.ShowObjectIdMethod,
-	g.ShowObjectTypeMethod,
 ).ShowByIdOperationWithFiltering(
 	g.ShowByIDLikeFiltering,
 	g.ShowByIDExtendedInFiltering,