Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify TF AWS provider configuration logic #1204

Merged
merged 3 commits into from
Mar 14, 2024
Merged

Unify TF AWS provider configuration logic #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7caa3a9
unify TF AWS provider configuration logic
erhancagirici Mar 6, 2024
1fabbe6
remove AWS TF Meta client copies from tf setup
erhancagirici Mar 12, 2024
481dde7
fix linter issues and address reviews
erhancagirici Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ kustomize-crds: output.init $(KUSTOMIZE) $(YQ)
@rm -fr $(OUTPUT_DIR)/package || $(FAIL)
@cp -R package $(OUTPUT_DIR) && \
cd $(OUTPUT_DIR)/package/crds && \
kustomize create --autodetect || $(FAIL)
$(KUSTOMIZE) create --autodetect || $(FAIL)
erhancagirici marked this conversation as resolved.
Show resolved Hide resolved
@export YQ=$(YQ) && \
XDG_CONFIG_HOME=$(PWD)/package $(KUSTOMIZE) build --enable-alpha-plugins $(OUTPUT_DIR)/package/kustomize -o $(OUTPUT_DIR)/package/crds.yaml || $(FAIL)
@$(OK) Kustomizing CRDs.
Expand Down
2 changes: 1 addition & 1 deletion cmd/generator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func main() {
if err != nil {
panic(fmt.Sprintf("cannot calculate the absolute path with %s", *repoRoot))
}
p, _, err := config.GetProvider(context.Background(), true)
p, err := config.GetProvider(context.Background(), true)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
dumpGeneratedResourceList(p, generatedResourceList)
dumpSkippedResourcesCSV(p, skippedResourcesCSV)
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/accessanalyzer/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/account/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/acm/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/acmpca/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/amp/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/amplify/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/apigateway/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/apigatewayv2/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/appautoscaling/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/appconfig/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/appflow/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/appintegrations/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/applicationinsights/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/appmesh/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/apprunner/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/appstream/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/appsync/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/athena/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/autoscaling/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/autoscalingplans/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/backup/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/batch/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/budgets/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/ce/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/chime/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/cloud9/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/cloudcontrol/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/cloudformation/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/cloudfront/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/cloudsearch/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
3 changes: 1 addition & 2 deletions cmd/provider/cloudtrail/zz_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ func main() {
kingpin.FatalIfError(resolverapis.BuildScheme(apis.AddToSchemes), "Cannot register the AWS APIs with the API resolver's runtime scheme")

ctx := context.Background()
provider, awsClient, err := config.GetProvider(ctx, false)
provider, err := config.GetProvider(ctx, false)
kingpin.FatalIfError(err, "Cannot initialize the provider configuration")
setupConfig.TerraformProvider = provider.TerraformProvider
setupConfig.AWSClient = awsClient
o := tjcontroller.Options{
Options: xpcontroller.Options{
Logger: log,
Expand Down
Loading
Loading