Consume StateFunc fix #1188

sergenyalcin · 2024-03-01T09:08:18Z

Description of your changes

This PR consumes the StateFunc fix in upjet. For more details please see: crossplane/upjet#358

I have:

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

How has this code been tested

Uptest

iam/v1beta1/policy.yaml https://github.com/upbound/provider-aws/actions/runs/8156409586
iam/v1beta1/rolepolicy.yaml https://github.com/upbound/provider-aws/actions/runs/8156410760
appsync/v1beta1/datasource.yaml https://github.com/upbound/provider-aws/actions/runs/8156888191
cloudwatch/v1beta1/dashboard.yaml https://github.com/upbound/provider-aws/actions/runs/8156941760
batch/v1beta1/jobdefinition.yaml https://github.com/upbound/provider-aws/actions/runs/8156916160
cloudformation/v1beta1/stack.yaml https://github.com/upbound/provider-aws/actions/runs/8156929889
codecommit/v1beta1/approvalruletemplateassociation.yaml https://github.com/upbound/provider-aws/actions/runs/8156961762
connect/v1beta1/contactflow.yaml https://github.com/upbound/provider-aws/actions/runs/8156975349
ecr/v1beta1/repositorypolicy.yaml https://github.com/upbound/provider-aws/actions/runs/8157057296
connect/v1beta1/contactflowmodule.yaml https://github.com/upbound/provider-aws/actions/runs/8156977904
ecr/v1beta1/registrypolicy.yaml https://github.com/upbound/provider-aws/actions/runs/8157054077
ecr/v1beta1/lifecyclepolicy.yaml https://github.com/upbound/provider-aws/actions/runs/8157048407
emrserverless/v1beta1/application.yaml https://github.com/upbound/provider-aws/actions/runs/8157166302
ecrpublic/v1beta1/repositorypolicy.yaml https://github.com/upbound/provider-aws/actions/runs/8157069209
evidently/v1beta1/segment.yaml https://github.com/upbound/provider-aws/actions/runs/8157189737
apigateway/v1beta1/integrationresponse.yaml https://github.com/upbound/provider-aws/actions/runs/8156865358
elbv2/v1beta1/lblistener.yaml https://github.com/upbound/provider-aws/actions/runs/8157148851
firehose/v1beta1/deliverystream.yaml https://github.com/upbound/provider-aws/actions/runs/8157195084
ecs/v1beta1/taskdefinition.yaml https://github.com/upbound/provider-aws/actions/runs/8157079157
iot/v1beta1/policy.yaml https://github.com/upbound/provider-aws/actions/runs/8157229377
glacier/v1beta1/vaultlock.yaml https://github.com/upbound/provider-aws/actions/runs/8157212867
elasticache/v1beta1/parametergroup.yaml https://github.com/upbound/provider-aws/actions/runs/8157108582
elasticache/v1beta1/subnetgroup.yaml https://github.com/upbound/provider-aws/actions/runs/8157119215
route53/v1beta1/healthcheck.yaml https://github.com/upbound/provider-aws/actions/runs/8157330813
route53resolver/v1beta1/rule.yaml https://github.com/upbound/provider-aws/actions/runs/8157348288
route53/v1beta1/record.yaml https://github.com/upbound/provider-aws/actions/runs/8157337746
ses/v1beta1/emailidentity.yaml https://github.com/upbound/provider-aws/actions/runs/8157388083
sns/v1beta1/topicpolicy.yaml https://github.com/upbound/provider-aws/actions/runs/8157399825
waf/v1beta1/regexmatchset.yaml https://github.com/upbound/provider-aws/actions/runs/8157431455
rds/v1beta1/instance.yaml https://github.com/upbound/provider-aws/actions/runs/8159835291
wafregional/v1beta1/regexmatchset.yaml https://github.com/upbound/provider-aws/actions/runs/8163133988
docdb/v1beta1/clusterinstance.yaml https://github.com/upbound/provider-aws/actions/runs/8163132120
elasticache/v1beta2/replicationgroup.yaml https://github.com/upbound/provider-aws/actions/runs/8163130068
elasticache/v1beta1/cluster.yaml https://github.com/upbound/provider-aws/actions/runs/8163128132

Manual

sqs.Queue
sqs.QueueRedrivePolicy
sqs.QueueRedriveAllowPolicy
ec2.Instance
networkmanager.CoreNetwork
dynamodb.Table

sergenyalcin · 2024-03-01T10:19:16Z

/test-examples="examples/iam/v1beta1/policy.yaml"

sergenyalcin · 2024-03-01T10:32:03Z

/test-examples="examples/iam/v1beta1/rolepolicy.yaml"

Signed-off-by: Sergen Yalçın <[email protected]>

sergenyalcin · 2024-03-05T12:41:24Z

/test-examples="examples/iam/v1beta1/policy.yaml"

sergenyalcin · 2024-03-05T12:41:30Z

/test-examples="examples/iam/v1beta1/rolepolicy.yaml"

sergenyalcin · 2024-03-05T13:12:11Z

/test-examples="examples/apigateway/v1beta1/integrationresponse.yaml"

sergenyalcin · 2024-03-05T13:13:44Z

/test-examples="examples/appsync/v1beta1/datasource.yaml"

sergenyalcin · 2024-03-05T13:15:40Z

/test-examples="examples/batch/v1beta1/jobdefinition.yaml"

sergenyalcin · 2024-03-05T13:16:38Z

/test-examples="examples/cloudformation/v1beta1/stack.yaml"

sergenyalcin · 2024-03-05T13:17:29Z

/test-examples="examples/cloudwatch/v1beta1/dashboard.yaml"

sergenyalcin · 2024-03-05T13:18:53Z

/test-examples="examples/codecommit/v1beta1/approvalruletemplateassociation.yaml"

sergenyalcin · 2024-03-05T13:19:51Z

/test-examples="examples/connect/v1beta1/contactflow.yaml"

sergenyalcin · 2024-03-05T13:20:03Z

/test-examples="examples/connect/v1beta1/contactflowmodule.yaml"

sergenyalcin · 2024-03-05T13:25:14Z

/test-examples="examples/ecr/v1beta1/lifecyclepolicy.yaml"

sergenyalcin · 2024-03-05T13:25:41Z

/test-examples="examples/ecr/v1beta1/registrypolicy.yaml"

sergenyalcin · 2024-03-05T13:25:58Z

/test-examples="examples/ecr/v1beta1/repositorypolicy.yaml"

sergenyalcin · 2024-03-05T13:27:04Z

/test-examples="examples/ecrpublic/v1beta1/repositorypolicy.yaml"

sergenyalcin · 2024-03-05T13:27:52Z

/test-examples="examples/ecs/v1beta1/taskdefinition.yaml"

sergenyalcin · 2024-03-05T13:30:15Z

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

sergenyalcin · 2024-03-05T13:31:00Z

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

sergenyalcin · 2024-03-05T13:31:38Z

/test-examples="examples/elasticsearch/v1beta1/domainpolicy.yaml"

sergenyalcin · 2024-03-05T13:33:03Z

/test-examples="examples/elbv2/v1beta1/lblistener.yaml"

sergenyalcin · 2024-03-05T13:34:18Z

/test-examples="examples/emrserverless/v1beta1/application.yaml"

sergenyalcin · 2024-03-05T13:36:01Z

/test-examples="examples/evidently/v1beta1/segment.yaml"

sergenyalcin · 2024-03-05T13:36:27Z

/test-examples="examples/firehose/v1beta1/deliverystream.yaml"

sergenyalcin · 2024-03-05T13:37:53Z

/test-examples="examples/glacier/v1beta1/vaultlock.yaml"

sergenyalcin · 2024-03-05T13:39:23Z

/test-examples="examples/iot/v1beta1/policy.yaml"

sergenyalcin · 2024-03-05T13:43:41Z

/test-examples="examples/rds/v1beta1/instance.yaml"

sergenyalcin · 2024-03-05T13:55:23Z

/test-examples="examples/waf/v1beta1/regexmatchset.yaml"

sergenyalcin · 2024-03-05T16:40:47Z

/test-examples="examples/apigateway/v1beta1/integrationresponse.yaml"

sergenyalcin · 2024-03-05T16:40:54Z

/test-examples="examples/rds/v1beta1/instance.yaml"

sergenyalcin · 2024-03-05T17:55:57Z

/test-examples="examples/apigateway/v1beta1/integrationresponse.yaml"

sergenyalcin · 2024-03-05T18:32:52Z

/test-examples="examples/apigateway/v1beta1/integrationresponse.yaml"

- apigateway.IntegrationResponse - rds.v1beta1.Instance - rds.v1beta2.Instance Signed-off-by: Sergen Yalçın <[email protected]>

sergenyalcin · 2024-03-05T21:02:41Z

/test-examples="examples/apigateway/v1beta1/integrationresponse.yaml"

- docdb.ClusterInstance - elasticache.Cluster - elasticache.ReplicationGroup Signed-off-by: Sergen Yalçın <[email protected]>

sergenyalcin · 2024-03-05T21:17:29Z

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

sergenyalcin · 2024-03-05T21:17:41Z

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

sergenyalcin · 2024-03-05T21:17:51Z

/test-examples="examples/docdb/v1beta1/clusterinstance.yaml"

sergenyalcin · 2024-03-05T21:18:01Z

/test-examples="examples/wafregional/v1beta1/regexmatchset.yaml"

Signed-off-by: Sergen Yalçın <[email protected]>

sergenyalcin · 2024-03-06T13:01:29Z

/test-examples="examples/iam/v1beta1/policy.yaml"

ulucinar

Thanks @sergenyalcin, lgtm. And special thanks for all the example manifest fixes/improvements here!

examples/apigateway/v1beta1/integrationresponse.yaml

ulucinar · 2024-03-07T07:58:57Z

examples/apigateway/v1beta1/integrationresponse.yaml

@@ -13,6 +13,8 @@ spec:
 apiVersion: apigateway.aws.upbound.io/v1beta1
 kind: IntegrationResponse
 metadata:
+  annotations:
+    uptest.upbound.io/disable-import: "true"


Why do we disable the import tests? A comment may help for these dependencies. Is it because we just want to test importing the main resource and not interested in importing the dependencies? If so, we may also consider running the import tests only for the main resources in the example manifests so that we don't need to disable the import tests for each of the dependencies, what do you think?

Added comment to the example manifest. As you know, for the update step we do this. I mean, we only execute the update step for the root resources. For import statement we may also consider executing this step on the root resource of the example manifest.

examples/rds/v1beta1/instance.yaml

Signed-off-by: Sergen Yalçın <[email protected]>

sergenyalcin force-pushed the consume-statefunc-fix branch from 8641ad0 to 5e62c84 Compare March 1, 2024 09:52

Consume StateFunc fix

2ca6cdf

Signed-off-by: Sergen Yalçın <[email protected]>

sergenyalcin force-pushed the consume-statefunc-fix branch from 5e62c84 to 2ca6cdf Compare March 5, 2024 12:41

ulucinar mentioned this pull request Mar 5, 2024

Removing the applying of StateFuncs to parameters crossplane/upjet#358

Merged

3 tasks

sergenyalcin force-pushed the consume-statefunc-fix branch from 5a9d821 to 85a9d37 Compare March 5, 2024 17:55

sergenyalcin force-pushed the consume-statefunc-fix branch from 85a9d37 to 4249af5 Compare March 5, 2024 18:32

Fix example manifests of:

7102740

- apigateway.IntegrationResponse - rds.v1beta1.Instance - rds.v1beta2.Instance Signed-off-by: Sergen Yalçın <[email protected]>

sergenyalcin force-pushed the consume-statefunc-fix branch from 4249af5 to 7102740 Compare March 5, 2024 21:02

sergenyalcin marked this pull request as ready for review March 5, 2024 21:15

sergenyalcin requested review from ulucinar and turkenf as code owners March 5, 2024 21:15

Enrich following example manifests:

49c9e77

- docdb.ClusterInstance - elasticache.Cluster - elasticache.ReplicationGroup Signed-off-by: Sergen Yalçın <[email protected]>

Switch to upstream upjet dependency

0945581

Signed-off-by: Sergen Yalçın <[email protected]>

ulucinar added the breaking-change label Mar 6, 2024

ulucinar approved these changes Mar 7, 2024

View reviewed changes

Add example-id annotations

c14dcff

Signed-off-by: Sergen Yalçın <[email protected]>

sergenyalcin merged commit fb0fb48 into crossplane-contrib:main Mar 7, 2024
9 checks passed

sergenyalcin deleted the consume-statefunc-fix branch March 7, 2024 11:34

This was referenced Mar 7, 2024

[release-1.1] Bump upjet to 1.2.2 #1196

Merged

[release-0.47] Bump upjet to 1.1.3 #1195

Merged

This was referenced Mar 7, 2024

fix(userdata): remove user_data and switch user_data_base64 to sensitive #1133

Closed

[Bug]: Garbled user data on EC2 instance #1109

Closed

Consume StateFunc fix #1188

Consume StateFunc fix #1188

Conversation

sergenyalcin commented Mar 1, 2024 • edited Loading

Description of your changes

How has this code been tested

Uptest

Manual

sergenyalcin commented Mar 1, 2024

sergenyalcin commented Mar 1, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 5, 2024

sergenyalcin commented Mar 6, 2024

ulucinar left a comment

Choose a reason for hiding this comment

ulucinar Mar 7, 2024

Choose a reason for hiding this comment

sergenyalcin Mar 7, 2024

Choose a reason for hiding this comment

sergenyalcin commented Mar 1, 2024 •

edited

Loading