Use 'names.ToSnakeCase'.

Author: ewbankkit

skaff/convert/convert.go

@@ -11,22 +11,6 @@ import (
 	"github.com/YakDriver/regexache"
 )
 
-// ToSnakeCase converts a camel cased string to snake case
-//
-// If the override argument is a non-empty string, its value is returned
-// unchanged.
-func ToSnakeCase(upper string, override string) string {
-	if override != "" {
-		return override
-	}
-
-	re := regexache.MustCompile(`([a-z])([A-Z]{2,})`)
-	upper = re.ReplaceAllString(upper, `${1}_${2}`)
-
-	re2 := regexache.MustCompile(`([A-Z][a-z])`)
-	return strings.TrimPrefix(strings.ToLower(re2.ReplaceAllString(upper, `_$1`)), "_")
-}
-
 // ToHumanResName converts a camel cased string to a human readable name
 func ToHumanResName(upper string) string {
 	re := regexache.MustCompile(`([a-z])([A-Z]{2,})`)

skaff/convert/convert_test.go

@@ -7,55 +7,6 @@ import (
 	"testing"
 )
 
-func TestToSnakeName(t *testing.T) {
-	testCases := []struct {
-		TestName string
-		Input    string
-		Expected string
-	}{
-		{
-			TestName: "empty",
-			Input:    "",
-			Expected: "",
-		},
-		{
-			TestName: "simple",
-			Input:    "Cheese",
-			Expected: "cheese",
-		},
-		{
-			TestName: "two word",
-			Input:    "CityLights",
-			Expected: "city_lights",
-		},
-		{
-			TestName: "three word",
-			Input:    "OpenEndResource",
-			Expected: "open_end_resource",
-		},
-		{
-			TestName: "initialism",
-			Input:    "DBInstance",
-			Expected: "db_instance",
-		},
-		{
-			TestName: "initialisms",
-			Input:    "DBInstanceVPCEndpoint",
-			Expected: "db_instance_vpc_endpoint",
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.TestName, func(t *testing.T) {
-			got := ToSnakeCase(testCase.Input, "")
-
-			if got != testCase.Expected {
-				t.Errorf("got %s, expected %s", got, testCase.Expected)
-			}
-		})
-	}
-}
-
 func TestToHumanResName(t *testing.T) {
 	testCases := []struct {
 		TestName string

skaff/datasource/datasource.go

@@ -14,6 +14,7 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/hashicorp/terraform-provider-aws/names"
 	"github.com/hashicorp/terraform-provider-aws/names/data"
 	"github.com/hashicorp/terraform-provider-aws/skaff/convert"
 )
@@ -67,7 +68,9 @@ func Create(dsName, snakeName string, comments, force, pluginFramework, tags boo
 		return fmt.Errorf("error checking: snake name should be all lower case with underscores, if needed (e.g., db_instance)")
 	}
 
-	snakeName = convert.ToSnakeCase(dsName, snakeName)
+	if snakeName != "" {
+		snakeName = names.ToSnakeCase(dsName)
+	}
 
 	service, err := data.LookupService(servicePackage)
 	if err != nil {

skaff/function/function.go

@@ -14,6 +14,7 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/hashicorp/terraform-provider-aws/names"
 	"github.com/hashicorp/terraform-provider-aws/skaff/convert"
 )
 
@@ -43,7 +44,9 @@ func Create(name, snakeName, description string, comments, force bool) error {
 		return fmt.Errorf("snake name should be all lower case with underscores, if needed (e.g., arn_build)")
 	}
 
-	snakeName = convert.ToSnakeCase(name, snakeName)
+	if snakeName != "" {
+		snakeName = names.ToSnakeCase(name)
+	}
 
 	templateData := TemplateData{
 		Function:        name,

skaff/go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.59 // indirect
 	github.com/hashicorp/hcl/v2 v2.22.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect

skaff/go.sum

@@ -13,6 +13,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.59 h1:j5ZrYJbLfZLJ9X5Bnp43z+ygN7kf6rbLCGIBGCIWWEA=
+github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.59/go.mod h1:jZEzCETkIzEinF749zPXsqpPmsA9P0fbMqRyoBh5UNo=
 github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M=
 github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=

skaff/resource/resource.go

@@ -14,6 +14,7 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/hashicorp/terraform-provider-aws/names"
 	"github.com/hashicorp/terraform-provider-aws/names/data"
 	"github.com/hashicorp/terraform-provider-aws/skaff/convert"
 )
@@ -67,7 +68,9 @@ func Create(resName, snakeName string, comments, force, pluginFramework, tags bo
 		return fmt.Errorf("error checking: snake name should be all lower case with underscores, if needed (e.g., db_instance)")
 	}
 
-	snakeName = convert.ToSnakeCase(resName, snakeName)
+	if snakeName != "" {
+		snakeName = names.ToSnakeCase(resName)
+	}
 
 	service, err := data.LookupService(servicePackage)
 	if err != nil {