Reconcile terraform plugin framework resources without CLI #1086

erhancagirici · 2024-01-16T08:02:58Z

Description of your changes

Reconciles terraform plugin framework resources without CLI using the new TerraformPluginFrameworkExternalClient no-fork architecture.

I have:

Run make reviewable test to ensure this PR is ready for review.

How has this code been tested

erhancagirici · 2024-01-16T13:03:51Z

/test-examples="examples/ec2/securitygroupingressrule.yaml"

erhancagirici · 2024-01-16T13:05:55Z

/test-examples="examples/cognitoidp/userpoolclient.yaml"

erhancagirici · 2024-01-16T13:06:47Z

/test-examples="examples/simpledb/domain.yaml"

erhancagirici · 2024-01-16T13:07:18Z

/test-examples="examples/appconfig/environment.yaml"

erhancagirici · 2024-01-16T14:54:35Z

/test-examples="examples/appconfig/environment.yaml"

erhancagirici · 2024-01-31T12:14:15Z

/test-examples="examples/ec2/securitygroupingressrule.yaml"

erhancagirici · 2024-01-31T12:14:18Z

/test-examples="examples/cognitoidp/userpoolclient.yaml"

erhancagirici · 2024-01-31T12:14:32Z

/test-examples="examples/simpledb/domain.yaml"

erhancagirici · 2024-01-31T12:14:39Z

/test-examples="examples/appconfig/environment.yaml"

erhancagirici · 2024-01-31T12:17:30Z

/test-examples="examples/ec2/v1beta1/securitygroupingressrule.yaml"

erhancagirici · 2024-01-31T12:17:47Z

/test-examples="examples/cognitoidp/v1beta1/userpoolclient.yaml"

erhancagirici · 2024-01-31T12:18:02Z

/test-examples="examples/simpledb/v1beta1/domain.yaml"

erhancagirici · 2024-01-31T12:18:48Z

/test-examples="examples/appconfig/v1beta1/environment.yaml"

erhancagirici · 2024-01-31T12:35:34Z

/test-examples="examples/ec2/v1beta1/securitygroupegressrule.yaml"

erhancagirici · 2024-01-31T14:30:56Z

/test-examples="examples/ec2/v1beta1/securitygroupingressrule.yaml"

erhancagirici · 2024-01-31T14:31:09Z

/test-examples="examples/cognitoidp/v1beta1/userpoolclient.yaml"

erhancagirici · 2024-01-31T14:31:17Z

/test-examples="examples/simpledb/v1beta1/domain.yaml"

erhancagirici · 2024-01-31T14:31:25Z

/test-examples="examples/appconfig/v1beta1/environment.yaml"

erhancagirici · 2024-01-31T14:32:05Z

/test-examples="examples/elasticache/v1beta1/replicationgroup.yaml"

ulucinar · 2024-01-31T16:36:14Z

/test-examples="examples/ec2/v1beta1/securitygroupingressrule.yaml"

ulucinar · 2024-01-31T16:37:03Z

/test-examples="examples/cognitoidp/v1beta1/userpoolclient.yaml"

ulucinar · 2024-01-31T16:37:17Z

/test-examples="examples/simpledb/v1beta1/domain.yaml"

ulucinar · 2024-01-31T16:37:32Z

/test-examples="examples/appconfig/v1beta1/environment.yaml"

ulucinar · 2024-01-31T16:37:43Z

/test-examples="examples/elasticache/v1beta1/replicationgroup.yaml"

ulucinar · 2024-01-31T17:47:32Z

/test-examples="examples/elasticache/v1beta1/replicationgroup.yaml"

ulucinar · 2024-01-31T17:47:38Z

/test-examples="examples/appconfig/v1beta1/environment.yaml"

ulucinar · 2024-01-31T17:47:43Z

/test-examples="examples/simpledb/v1beta1/domain.yaml"

ulucinar · 2024-01-31T17:47:48Z

/test-examples="examples/cognitoidp/v1beta1/userpoolclient.yaml"

ulucinar · 2024-01-31T17:47:56Z

/test-examples="examples/ec2/v1beta1/securitygroupingressrule.yaml"

ulucinar · 2024-01-31T17:49:59Z

/test-examples="examples/ec2/v1beta1/securitygroupegressrule.yaml"

ulucinar

Thanks @erhancagirici, lgtm. We may consider cleaning up the commit history.

ulucinar · 2024-01-31T18:26:07Z

config/externalname.go

-	// terraform-plugin-framework
-	"aws_appconfig_environment": config.IdentifierFromProvider,
-}
+var CLIReconciledExternalNameConfigs = map[string]config.ExternalName{}


nit: Let's remove this map as it's currently not needed. If we need in the future, then we can add.

lets remove this at CLI removal PR.

ulucinar · 2024-01-31T18:26:56Z

config/externalname.go

+			if !configured {
+				e, configured = CLIReconciledExternalNameConfigs[r.Name]
+			}


Please see the comment above regarding the CLI-based reconciliation map.

ulucinar · 2024-01-31T18:30:39Z

config/externalname.go

+	//
+	// AppConfig Environments can be imported by using the environment ID and application ID separated by a colon (:)
+	// terraform-plugin-framework
+	"aws_appconfig_environment": appConfigEnvironment(),


If I'm not mistaken, the external-name syntax is not changing for the resource as we move from the CLI-based implementation to the native fw reconciliation. We are allowed to break APIs with the next release, and if we are breaking APIs, it's important for us to capture this in the release notes.

Signed-off-by: Cem Mergenci <cmergenci@gmail.com>

…ources Signed-off-by: Erhan Cagirici <erhan@upbound.io>

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

…ix aws_cognito_user_pool_client external name config Signed-off-by: Erhan Cagirici <erhan@upbound.io>

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

… name config Signed-off-by: Erhan Cagirici <erhan@upbound.io>

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>

erhancagirici · 2024-02-01T08:01:52Z

/test-examples="examples/ec2/v1beta1/securitygroupingressrule.yaml"

erhancagirici force-pushed the no-fork-v4.67.0-fw branch from 6619732 to c887497 Compare January 31, 2024 11:29

erhancagirici marked this pull request as ready for review January 31, 2024 12:07

erhancagirici requested review from ulucinar, sergenyalcin and turkenf as code owners January 31, 2024 12:07

ulucinar mentioned this pull request Jan 31, 2024

terraform plugin framework external client & connectors crossplane/upjet#329

Merged

3 tasks

ulucinar approved these changes Jan 31, 2024

View reviewed changes

mergenci and others added 15 commits February 1, 2024 10:37

Break ground for Terraform Plugin Framework reconciliation.

e9f4718

Signed-off-by: Cem Mergenci <cmergenci@gmail.com>

switch to plugin-fw async external client for remaining cli-based res…

85b2837

…ources Signed-off-by: Erhan Cagirici <erhan@upbound.io>

dynamically configure provider of the framework server

da8ea4b

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

move aws_appconfig_environment to plugin-fw external name configs & f…

7916fad

…ix aws_cognito_user_pool_client external name config Signed-off-by: Erhan Cagirici <erhan@upbound.io>

clean all cli-reconciled external name configs

489ec36

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

set terraform-provider-aws to cdf2d7f9474f030f1187e2bc5ea4bc8e99ace81f

5e1e54b

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

generate Environment.appconfig controller with plugin framework

37fceff

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

ensure non-empty TF ID for Environment.appconfig resource in external…

9983676

… name config Signed-off-by: Erhan Cagirici <erhan@upbound.io>

bump terraform-provider-aws to 2db71a3d5299606ff972ae49ce753c7b4cc8942d

bc3e24e

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

use context.WithoutCancel at provider native configuration

eb1990b

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

fix Environment.appconfig external name config

1c86003

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

bump terraform-provider-aws to c69f68a599163aaa41da20cccbd7781e7b8e28c4

a827b1c

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

remove passed context to NewProvider

8621373

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

move userpoolclient examples to versioned folder

f10b5a9

Signed-off-by: Erhan Cagirici <erhan@upbound.io>

Bump upjet to commit 3c2fda9d6737

ec4cbf8

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>

erhancagirici force-pushed the no-fork-v4.67.0-fw branch from 3306ca2 to ec4cbf8 Compare February 1, 2024 07:53

erhancagirici merged commit 9b4cb47 into crossplane-contrib:main Feb 1, 2024
9 of 10 checks passed

erhancagirici deleted the no-fork-v4.67.0-fw branch February 1, 2024 08:19

erhancagirici mentioned this pull request Feb 1, 2024

Revert upjet changes around calculating instance diff in 0.47 #1104

Closed

1 task

ulucinar mentioned this pull request Feb 1, 2024

Remove the Terraform CLI from the provider package and deprecate the relevant provider command-line flags #1122

Merged

1 task

mergenci mentioned this pull request Feb 26, 2024

MEMBERSHIP: mergenci crossplane/org#73

Closed

6 tasks

Reconcile terraform plugin framework resources without CLI #1086

Reconcile terraform plugin framework resources without CLI #1086

Conversation

erhancagirici commented Jan 16, 2024 • edited Loading

Description of your changes

How has this code been tested

erhancagirici commented Jan 16, 2024

erhancagirici commented Jan 16, 2024

erhancagirici commented Jan 16, 2024

erhancagirici commented Jan 16, 2024

erhancagirici commented Jan 16, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

erhancagirici commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar commented Jan 31, 2024

ulucinar left a comment

Choose a reason for hiding this comment

ulucinar Jan 31, 2024

Choose a reason for hiding this comment

erhancagirici Feb 1, 2024

Choose a reason for hiding this comment

ulucinar Jan 31, 2024

Choose a reason for hiding this comment

ulucinar Jan 31, 2024

Choose a reason for hiding this comment

erhancagirici commented Feb 1, 2024

erhancagirici commented Jan 16, 2024 •

edited

Loading