fix(ec2): fix ipv6 field issues in ec2 group

Signed-off-by: Christopher Paul Haar <[email protected]>
crossplane-contrib · Apr 28, 2023 · f4cdb59 · f4cdb59
1 parent e62e471
commit f4cdb59
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 5 deletions.
diff --git a/apis/ec2/v1beta1/zz_generated_terraformed.go b/apis/ec2/v1beta1/zz_generated_terraformed.go
diff --git a/build b/build
diff --git a/config/ec2/config.go b/config/ec2/config.go
@@ -46,6 +46,8 @@ func Configure(p *config.Provider) {
 				"source_dest_check",
 				"vpc_security_group_ids",
 				"associate_public_ip_address",
+				"ipv6_addresses",
+				"ipv6_address_count",
 			},
 		}
 		config.MoveToStatus(r.TerraformResource, "security_groups")
@@ -173,7 +175,7 @@ func Configure(p *config.Provider) {
 		}
 		r.LateInitializer = config.LateInitializer{
 			IgnoredFields: []string{
-				"interface_type", "private_ip_list", "private_ips",
+				"interface_type", "private_ip_list", "private_ips", "ipv6_address_count",
 			},
 		}
 		// Mutually exclusive with aws_network_interface_attachment

diff --git a/examples/ec2/instance.yaml b/examples/ec2/instance.yaml
@@ -3,6 +3,9 @@ kind: Instance
 metadata:
   annotations:
     uptest.upbound.io/timeout: "3600"
+    meta.upbound.io/example-id: ec2/v1beta1/instance
+  labels:
+    testing.upbound.io/example-name: sample-instance
   name: sample-instance
 spec:
   forProvider:
@@ -11,7 +14,63 @@ spec:
     instanceType: t2.micro
     networkInterface:
     - deviceIndex: 0
-      networkInterfaceIdRef:
-        name: sample-ni
+      networkInterfaceIdSelector:
+        matchLabels:
+          testing.upbound.io/example-name: sample-instance
     creditSpecification:
-    - cpuCredits: unlimited
+    - cpuCredits: unlimited
+
+---
+
+apiVersion: ec2.aws.upbound.io/v1beta1
+kind: NetworkInterface
+metadata:
+  annotations:
+    meta.upbound.io/example-id: ec2/v1beta1/instance
+  labels:
+    testing.upbound.io/example-name: sample-instance
+  name: sample-instance
+spec:
+  forProvider:
+    region: us-west-1
+    subnetIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: sample-instance
+    privateIps:
+      - "172.16.10.100"
+
+---
+
+apiVersion: ec2.aws.upbound.io/v1beta1
+kind: Subnet
+metadata:
+  annotations:
+    meta.upbound.io/example-id: ec2/v1beta1/instance
+  labels:
+    testing.upbound.io/example-name: sample-instance
+  name: sample-instance
+spec:
+  forProvider:
+    region: us-west-1
+    availabilityZone: us-west-1b
+    vpcIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: sample-instance
+    cidrBlock: 172.16.10.0/24
+
+---
+
+apiVersion: ec2.aws.upbound.io/v1beta1
+kind: VPC
+metadata:
+  annotations:
+    meta.upbound.io/example-id: ec2/v1beta1/instance
+  labels:
+    testing.upbound.io/example-name: sample-instance
+  name: sample-instance
+spec:
+  forProvider:
+    region: us-west-1
+    cidrBlock: 172.16.0.0/16
+    tags:
+      Name: DemoVpc
+1 −1		makelib/common.mk
+1 −1		makelib/golang.mk
+1 −1		makelib/k8s_tools.mk
+0 −8		makelib/xpkg.mk