From 6b3b6feea072a86925c6597f7424560852a5f0da Mon Sep 17 00:00:00 2001 From: brycahta Date: Thu, 14 Apr 2022 11:27:56 -0500 Subject: [PATCH] move config package to pkg directory --- cmd/ack-generate/command/common.go | 2 +- pkg/{generate => }/config/config.go | 0 pkg/{generate => }/config/field.go | 0 pkg/{generate => }/config/operation.go | 0 pkg/{generate => }/config/resource.go | 0 pkg/{generate => }/config/version.go | 0 pkg/generate/ack/config.go | 2 +- pkg/generate/ack/controller.go | 2 +- pkg/generate/code/check.go | 2 +- pkg/generate/code/common.go | 2 +- pkg/generate/code/compare.go | 4 ++-- pkg/generate/code/late_initialize.go | 2 +- pkg/generate/code/set_resource.go | 2 +- pkg/generate/code/set_sdk.go | 2 +- pkg/generate/code/synced.go | 2 +- pkg/generate/crossplane/config.go | 2 +- pkg/model/crd.go | 2 +- pkg/model/field.go | 2 +- pkg/model/model.go | 2 +- pkg/model/multiversion/manager.go | 2 +- pkg/model/op.go | 2 +- pkg/model/sdk_api.go | 2 +- pkg/model/types.go | 2 +- pkg/sdk/custom_shapes_test.go | 2 +- pkg/sdk/helper.go | 2 +- pkg/sdk/helper_test.go | 2 +- pkg/testutil/schema_helper.go | 2 +- 27 files changed, 23 insertions(+), 23 deletions(-) rename pkg/{generate => }/config/config.go (100%) rename pkg/{generate => }/config/field.go (100%) rename pkg/{generate => }/config/operation.go (100%) rename pkg/{generate => }/config/resource.go (100%) rename pkg/{generate => }/config/version.go (100%) diff --git a/cmd/ack-generate/command/common.go b/cmd/ack-generate/command/common.go index 05b2120e..cfe6378e 100644 --- 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/generate/config/config.go b/pkg/config/config.go similarity index 100% rename from pkg/generate/config/config.go rename to pkg/config/config.go diff --git a/pkg/generate/config/field.go b/pkg/config/field.go similarity index 100% rename from pkg/generate/config/field.go rename to pkg/config/field.go diff --git a/pkg/generate/config/operation.go b/pkg/config/operation.go similarity index 100% rename from pkg/generate/config/operation.go rename to pkg/config/operation.go diff --git a/pkg/generate/config/resource.go b/pkg/config/resource.go similarity index 100% rename from pkg/generate/config/resource.go rename to pkg/config/resource.go diff --git a/pkg/generate/config/version.go b/pkg/config/version.go similarity index 100% rename from pkg/generate/config/version.go rename to pkg/config/version.go diff --git a/pkg/generate/ack/config.go b/pkg/generate/ack/config.go index 488fdeb7..fd259fa9 100644 --- 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 index c48db4fa..53d4f4c7 100644 --- 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 index 18304ab0..48694f04 100644 --- 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 index 5a44035b..338c0020 100644 --- 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 index 8f9a480f..f085b34f 100644 --- 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 index 5ad50ac6..8144f347 100644 --- 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 index 95981c2b..c1301644 100644 --- 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 index 90781ce4..9ab9d414 100644 --- 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 index c4ebcf31..88431c56 100644 --- 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 index afbb767c..659c34e0 100644 --- 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 index 200bc9a8..f0f6ca9e 100644 --- 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 index ffbadc47..fdeb6c39 100644 --- 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 index a553dc15..3e710131 100644 --- 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 index 8b11850c..778e455c 100644 --- 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 index 6309ed52..94c212c9 100644 --- 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 index d9ab2e6c..c895706e 100644 --- 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 index 5301ebc8..cd8b3722 100644 --- 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 index 3ee8eb91..bc033b12 100644 --- 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 index 84509d82..4efe0fc1 100644 --- 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 index 6b060edd..2097eba9 100644 --- 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 index dcce079d..d46e7282 100644 --- 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" )