move config package to pkg directory (#323)

brycahta · web-flow · commit dfc6ebb4ff7e · 2022-04-14T13:45:49.000-07:00
Issue #, if available: aws-controllers-k8s/community#1184 Description of changes: * relocate config package from _pkg/generate/_ to _pkg/_ * update import paths * no functional changes By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
diff --git a/cmd/ack-generate/command/common.go b/cmd/ack-generate/command/common.go
@@ -27,8 +27,8 @@ import (
 
 	"golang.org/x/mod/modfile"
 
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	ackgenerate "github.com/aws-controllers-k8s/code-generator/pkg/generate/ack"
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
 	ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
 	acksdk "github.com/aws-controllers-k8s/code-generator/pkg/sdk"
 	"github.com/aws-controllers-k8s/code-generator/pkg/util"
diff --git a/pkg/config/config.go b/pkg/config/config.go
diff --git a/pkg/config/field.go b/pkg/config/field.go
diff --git a/pkg/config/operation.go b/pkg/config/operation.go
diff --git a/pkg/config/resource.go b/pkg/config/resource.go
diff --git a/pkg/config/version.go b/pkg/config/version.go
diff --git a/pkg/generate/ack/config.go b/pkg/generate/ack/config.go
@@ -13,7 +13,7 @@
 
 package ack
 
-import "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+import "github.com/aws-controllers-k8s/code-generator/pkg/config"
 
 // DefaultConfig is the default configuration for generating ACK code
 var DefaultConfig = config.Config{
diff --git a/pkg/generate/ack/controller.go b/pkg/generate/ack/controller.go
@@ -18,8 +18,8 @@ import (
 	"strings"
 	ttpl "text/template"
 
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/generate/code"
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/generate/templateset"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 	ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
diff --git a/pkg/generate/code/check.go b/pkg/generate/code/check.go
@@ -19,8 +19,8 @@ import (
 
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
 
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/fieldpath"
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 )
 
diff --git a/pkg/generate/code/common.go b/pkg/generate/code/common.go
@@ -20,7 +20,7 @@ import (
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
 	"github.com/gertd/go-pluralize"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 	"github.com/aws-controllers-k8s/code-generator/pkg/util"
 )
diff --git a/pkg/generate/code/compare.go b/pkg/generate/code/compare.go
@@ -20,7 +20,7 @@ import (
 
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 	"github.com/aws-controllers-k8s/code-generator/pkg/names"
 )
@@ -565,7 +565,7 @@ func CompareStruct(
 		// memberFieldPath contains the field path along with the prefix cfg.PrefixConfig.SpecField + "." hence we
 		// would need to substring to exclude cfg.PrefixConfig.SpecField + "." to get correct field config.
 		specFieldLen := len(strings.TrimPrefix(cfg.PrefixConfig.SpecField, "."))
-		fieldConfig := fieldConfigs[memberFieldPath[specFieldLen + 1: len(memberFieldPath)]]
+		fieldConfig := fieldConfigs[memberFieldPath[specFieldLen+1:len(memberFieldPath)]]
 		if fieldConfig != nil {
 			compareConfig = fieldConfig.Compare
 		}
diff --git a/pkg/generate/code/late_initialize.go b/pkg/generate/code/late_initialize.go
@@ -18,7 +18,7 @@ import (
 	"sort"
 	"strings"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 )
 
diff --git a/pkg/generate/code/set_resource.go b/pkg/generate/code/set_resource.go
@@ -20,8 +20,8 @@ import (
 
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
 
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/fieldpath"
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 	"github.com/aws-controllers-k8s/code-generator/pkg/names"
 	"github.com/aws-controllers-k8s/code-generator/pkg/util"
diff --git a/pkg/generate/code/set_sdk.go b/pkg/generate/code/set_sdk.go
@@ -20,7 +20,7 @@ import (
 
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 	"github.com/aws-controllers-k8s/code-generator/pkg/names"
 )
diff --git a/pkg/generate/code/synced.go b/pkg/generate/code/synced.go
@@ -17,8 +17,8 @@ import (
 	"fmt"
 	"strings"
 
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/fieldpath"
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
diff --git a/pkg/generate/crossplane/config.go b/pkg/generate/crossplane/config.go
@@ -13,7 +13,7 @@
 
 package crossplane
 
-import "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+import "github.com/aws-controllers-k8s/code-generator/pkg/config"
 
 // DefaultConfig is the default config object for Crossplane controllers.
 var DefaultConfig = config.Config{
diff --git a/pkg/model/crd.go b/pkg/model/crd.go
@@ -22,7 +22,7 @@ import (
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
 	"github.com/gertd/go-pluralize"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/names"
 	"github.com/aws-controllers-k8s/code-generator/pkg/util"
 )
diff --git a/pkg/model/field.go b/pkg/model/field.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/gertd/go-pluralize"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/names"
 	"github.com/aws-controllers-k8s/code-generator/pkg/util"
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
diff --git a/pkg/model/model.go b/pkg/model/model.go
@@ -19,8 +19,8 @@ import (
 	"sort"
 	"strings"
 
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	ackfp "github.com/aws-controllers-k8s/code-generator/pkg/fieldpath"
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/generate/templateset"
 	"github.com/aws-controllers-k8s/code-generator/pkg/names"
 	"github.com/aws-controllers-k8s/code-generator/pkg/util"
diff --git a/pkg/model/multiversion/manager.go b/pkg/model/multiversion/manager.go
@@ -20,7 +20,7 @@ import (
 
 	"gopkg.in/src-d/go-git.v4"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	ackmetadata "github.com/aws-controllers-k8s/code-generator/pkg/metadata"
 	ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
 	acksdk "github.com/aws-controllers-k8s/code-generator/pkg/sdk"
diff --git a/pkg/model/op.go b/pkg/model/op.go
@@ -19,7 +19,7 @@ import (
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
 	"github.com/gertd/go-pluralize"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 )
 
 type OpType int
diff --git a/pkg/model/sdk_api.go b/pkg/model/sdk_api.go
@@ -19,7 +19,7 @@ import (
 
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/names"
 	"github.com/aws-controllers-k8s/code-generator/pkg/util"
 )
diff --git a/pkg/model/types.go b/pkg/model/types.go
@@ -18,7 +18,7 @@ import (
 
 	awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/names"
 )
 
diff --git a/pkg/sdk/custom_shapes_test.go b/pkg/sdk/custom_shapes_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	config "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	config "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 	"github.com/aws-controllers-k8s/code-generator/pkg/sdk"
 )
diff --git a/pkg/sdk/helper.go b/pkg/sdk/helper.go
@@ -23,7 +23,7 @@ import (
 
 	"gopkg.in/src-d/go-git.v4"
 
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 	"github.com/aws-controllers-k8s/code-generator/pkg/util"
 
diff --git a/pkg/sdk/helper_test.go b/pkg/sdk/helper_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	config "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
+	config "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	"github.com/aws-controllers-k8s/code-generator/pkg/model"
 	"github.com/aws-controllers-k8s/code-generator/pkg/sdk"
 )
diff --git a/pkg/testutil/schema_helper.go b/pkg/testutil/schema_helper.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 	"testing"
 
+	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"
 	ackgenerate "github.com/aws-controllers-k8s/code-generator/pkg/generate/ack"
-	ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
 	ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
 	acksdk "github.com/aws-controllers-k8s/code-generator/pkg/sdk"
 )

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ import (`
`19`	`19`
`20`	`20`	`awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"`
`21`	`21`
	`22`	`+ ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"`
`22`	`23`	`"github.com/aws-controllers-k8s/code-generator/pkg/fieldpath"`
`23`		`- ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"`
`24`	`24`	`"github.com/aws-controllers-k8s/code-generator/pkg/model"`
`25`	`25`	`)`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`awssdkmodel "github.com/aws/aws-sdk-go/private/model/api"`
`21`	`21`	`"github.com/gertd/go-pluralize"`
`22`	`22`
`23`		`- ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"`
	`23`	`+ ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/config"`
`24`	`24`	`"github.com/aws-controllers-k8s/code-generator/pkg/model"`
`25`	`25`	`"github.com/aws-controllers-k8s/code-generator/pkg/util"`
`26`	`26`	`)`