remove AWS TF Meta client copies from tf setup

These copies are not needed anymore after refactoring the AWS configuration logic to not use native provider Configure() Signed-off-by: Erhan Cagirici <[email protected]>
crossplane-contrib · Mar 12, 2024 · 53599ef · 53599ef
1 parent a2f0d52
commit 53599ef
Show file tree

Hide file tree

Showing 165 changed files with 171 additions and 346 deletions.
diff --git a/cmd/generator/main.go b/cmd/generator/main.go
@@ -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)

diff --git a/cmd/provider/accessanalyzer/zz_main.go b/cmd/provider/accessanalyzer/zz_main.go
@@ -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,

diff --git a/cmd/provider/account/zz_main.go b/cmd/provider/account/zz_main.go
@@ -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,

diff --git a/cmd/provider/acm/zz_main.go b/cmd/provider/acm/zz_main.go
@@ -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,

diff --git a/cmd/provider/acmpca/zz_main.go b/cmd/provider/acmpca/zz_main.go
@@ -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,

diff --git a/cmd/provider/amp/zz_main.go b/cmd/provider/amp/zz_main.go
@@ -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,

diff --git a/cmd/provider/amplify/zz_main.go b/cmd/provider/amplify/zz_main.go
@@ -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,

diff --git a/cmd/provider/apigateway/zz_main.go b/cmd/provider/apigateway/zz_main.go
@@ -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,

diff --git a/cmd/provider/apigatewayv2/zz_main.go b/cmd/provider/apigatewayv2/zz_main.go
@@ -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,

diff --git a/cmd/provider/appautoscaling/zz_main.go b/cmd/provider/appautoscaling/zz_main.go
@@ -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,

diff --git a/cmd/provider/appconfig/zz_main.go b/cmd/provider/appconfig/zz_main.go
@@ -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,

diff --git a/cmd/provider/appflow/zz_main.go b/cmd/provider/appflow/zz_main.go
@@ -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,

diff --git a/cmd/provider/appintegrations/zz_main.go b/cmd/provider/appintegrations/zz_main.go
@@ -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,

diff --git a/cmd/provider/applicationinsights/zz_main.go b/cmd/provider/applicationinsights/zz_main.go
@@ -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,

diff --git a/cmd/provider/appmesh/zz_main.go b/cmd/provider/appmesh/zz_main.go
@@ -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,

diff --git a/cmd/provider/apprunner/zz_main.go b/cmd/provider/apprunner/zz_main.go
@@ -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,

diff --git a/cmd/provider/appstream/zz_main.go b/cmd/provider/appstream/zz_main.go
@@ -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,

diff --git a/cmd/provider/appsync/zz_main.go b/cmd/provider/appsync/zz_main.go
@@ -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,

diff --git a/cmd/provider/athena/zz_main.go b/cmd/provider/athena/zz_main.go
@@ -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,

diff --git a/cmd/provider/autoscaling/zz_main.go b/cmd/provider/autoscaling/zz_main.go
@@ -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,

diff --git a/cmd/provider/autoscalingplans/zz_main.go b/cmd/provider/autoscalingplans/zz_main.go
@@ -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,

diff --git a/cmd/provider/backup/zz_main.go b/cmd/provider/backup/zz_main.go
@@ -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,

diff --git a/cmd/provider/batch/zz_main.go b/cmd/provider/batch/zz_main.go
@@ -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,

diff --git a/cmd/provider/budgets/zz_main.go b/cmd/provider/budgets/zz_main.go
@@ -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,

diff --git a/cmd/provider/ce/zz_main.go b/cmd/provider/ce/zz_main.go
@@ -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,

diff --git a/cmd/provider/chime/zz_main.go b/cmd/provider/chime/zz_main.go
@@ -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,

diff --git a/cmd/provider/cloud9/zz_main.go b/cmd/provider/cloud9/zz_main.go
@@ -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,

diff --git a/cmd/provider/cloudcontrol/zz_main.go b/cmd/provider/cloudcontrol/zz_main.go
@@ -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,

diff --git a/cmd/provider/cloudformation/zz_main.go b/cmd/provider/cloudformation/zz_main.go
@@ -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,

diff --git a/cmd/provider/cloudfront/zz_main.go b/cmd/provider/cloudfront/zz_main.go
@@ -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,

diff --git a/cmd/provider/cloudsearch/zz_main.go b/cmd/provider/cloudsearch/zz_main.go
@@ -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,

diff --git a/cmd/provider/cloudtrail/zz_main.go b/cmd/provider/cloudtrail/zz_main.go
@@ -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,

diff --git a/cmd/provider/cloudwatch/zz_main.go b/cmd/provider/cloudwatch/zz_main.go
@@ -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,