Merge pull request #1610 from crossplane-contrib/backport-1599-to-rel…

…ease-1.18 [Backport release-1.18] add subnet_configuration to VPCEndpoint LateInit
crossplane-contrib · Dec 18, 2024 · b09f812 · b09f812
2 parents 35a6b66 + 4412ea2
commit b09f812
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/apis/ec2/v1beta1/zz_vpcendpoint_terraformed.go b/apis/ec2/v1beta1/zz_vpcendpoint_terraformed.go
diff --git a/apis/ec2/v1beta2/zz_vpcendpoint_terraformed.go b/apis/ec2/v1beta2/zz_vpcendpoint_terraformed.go
diff --git a/config/ec2/config.go b/config/ec2/config.go
@@ -153,6 +153,12 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 		// aws_vpc_endpoint_subnet_association
 		// aws_vpc_endpoint_route_table_association
 		// aws_vpc_endpoint_security_group_association
+		r.LateInitializer = config.LateInitializer{
+			// Conflicts with VPCEndpointSubnetAssociation
+			IgnoredFields: []string{
+				"subnet_configuration",
+			},
+		}
 		config.MoveToStatus(r.TerraformResource, "subnet_ids", "security_group_ids", "route_table_ids")
 		delete(r.References, "vpc_endpoint_type")
 	})

diff --git a/examples/ec2/v1beta1/vpcendpointsubnetassociation.yaml b/examples/ec2/v1beta1/vpcendpointsubnetassociation.yaml
@@ -5,6 +5,8 @@
 apiVersion: ec2.aws.upbound.io/v1beta1
 kind: VPCEndpointSubnetAssociation
 metadata:
+  annotations:
+    uptest.upbound.io/disable-import: "true"
   labels:
     testing.upbound.io/example-name: sn_ec2
   name: sn-ec2