Merge pull request #1167 from ulucinar/fix-firewall-update

Fix the update loop in Firewall.networkfirewall resource
crossplane-contrib · Feb 28, 2024 · cbef5d5 · cbef5d5
2 parents b9c1516 + e059d5c
commit cbef5d5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -65,7 +65,7 @@ export SUBPACKAGES := $(SUBPACKAGES)
 KIND_VERSION = v0.21.0
 UP_VERSION = v0.20.0
 UP_CHANNEL = stable
-UPTEST_VERSION = v0.11.0
+UPTEST_VERSION = v0.11.1
 KUSTOMIZE_VERSION = v5.3.0
 YQ_VERSION = v4.40.5
 

diff --git a/config/networkfirewall/config.go b/config/networkfirewall/config.go
@@ -76,6 +76,9 @@ func Configure(p *config.Provider) { // nolint:gocyclo
 					}
 				}
 			}
+			if diff.Attributes != nil {
+				delete(diff.Attributes, "firewall_status.#")
+			}
 			return diff, nil
 		}
 	})

diff --git a/examples/networkfirewall/v1beta1/firewall.yaml b/examples/networkfirewall/v1beta1/firewall.yaml
@@ -4,11 +4,14 @@ metadata:
   annotations:
     uptest.upbound.io/timeout: "3600"
     meta.upbound.io/example-id: networkfirewall/v1beta1/firewall
+    uptest.upbound.io/update-parameter: '{"tags":{"update-test-tag":"val"}}'
   labels:
     testing.upbound.io/example-name: example
   name: firewallname
 spec:
   forProvider:
+    firewallPolicyChangeProtection: true
+    subnetChangeProtection: true
     firewallPolicyArnSelector:
       matchLabels:
         testing.upbound.io/example-name: example
@@ -113,6 +116,8 @@ spec:
 apiVersion: ec2.aws.upbound.io/v1beta1
 kind: VPC
 metadata:
+  annotations:
+    meta.upbound.io/example-id: networkfirewall/v1beta1/firewall
   labels:
     testing.upbound.io/example-name: example
   name: sample-vpc
@@ -128,6 +133,8 @@ spec:
 apiVersion: ec2.aws.upbound.io/v1beta1
 kind: Subnet
 metadata:
+  annotations:
+    meta.upbound.io/example-id: networkfirewall/v1beta1/firewall
   labels:
     testing.upbound.io/example-name: example
   name: sample-subnet1
@@ -145,7 +152,7 @@ apiVersion: networkfirewall.aws.upbound.io/v1beta1
 kind: LoggingConfiguration
 metadata:
   annotations:
-    meta.upbound.io/example-id: networkfirewall/v1beta1/loggingconfiguration
+    meta.upbound.io/example-id: networkfirewall/v1beta1/firewall
   labels:
     testing.upbound.io/example-name: example
   name: example
@@ -168,9 +175,11 @@ spec:
 apiVersion: s3.aws.upbound.io/v1beta1
 kind: Bucket
 metadata:
-  name: uptest-networkfirewall-logging
+  annotations:
+    meta.upbound.io/example-id: networkfirewall/v1beta1/firewall
   labels:
     testing.upbound.io/example-name: s3-networkfirewall
+  name: uptest-networkfirewall-logging
 spec:
   deletionPolicy: Orphan
   forProvider:
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,9 @@ func Configure(p *config.Provider) { // nolint:gocyclo @@
     					}
     				}
     			}
+    			if diff.Attributes != nil {
+    				delete(diff.Attributes, "firewall_status.#")
+    			}
     			return diff, nil
     		}
     	})
@@ Expand Down @@