Merge pull request #1877 from erhancagirici/ignore-diff-route53-cname-trailing-dots

fix: ignore diff for trailing dots in Record.route53 names

Author: erhancagirici

Makefile

@@ -82,7 +82,7 @@ export SUBPACKAGES := $(SUBPACKAGES)
 KIND_VERSION = v0.29.0
 UP_VERSION = v0.40.0-0.rc.3
 UP_CHANNEL = alpha
-UPTEST_VERSION = v2.0.1
+UPTEST_VERSION = v2.1.0
 KUSTOMIZE_VERSION = v5.3.0
 YQ_VERSION = v4.40.5
 CROSSPLANE_VERSION = 1.20.0

config/cluster/route53/config.go

@@ -5,7 +5,10 @@
 package route53
 
 import (
+	"strings"
+
 	"github.com/crossplane/upjet/v2/pkg/config"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
 // Configure adds configurations for the route53 group.
@@ -32,6 +35,19 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 		}
 		delete(r.References, "alias.name")
 		delete(r.References, "alias.zone_id")
+		r.TerraformCustomDiff = func(diff *terraform.InstanceDiff, state *terraform.InstanceState, config *terraform.ResourceConfig) (*terraform.InstanceDiff, error) {
+			if diff == nil || diff.Empty() || diff.Destroy || diff.Attributes == nil {
+				return diff, nil
+			}
+			nameDiff, ok := diff.Attributes["name"]
+			if !ok {
+				return diff, nil
+			}
+			if strings.TrimSuffix(nameDiff.New, ".") == strings.TrimSuffix(nameDiff.Old, ".") {
+				delete(diff.Attributes, "name")
+			}
+			return diff, nil
+		}
 	})
 	p.AddResourceConfigurator("aws_route53_vpc_association_authorization", func(r *config.Resource) {
 		r.References["zone_id"] = config.Reference{

config/namespaced/route53/config.go

@@ -5,7 +5,10 @@
 package route53
 
 import (
+	"strings"
+
 	"github.com/crossplane/upjet/v2/pkg/config"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
 // Configure adds configurations for the route53 group.
@@ -32,6 +35,19 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 		}
 		delete(r.References, "alias.name")
 		delete(r.References, "alias.zone_id")
+		r.TerraformCustomDiff = func(diff *terraform.InstanceDiff, state *terraform.InstanceState, config *terraform.ResourceConfig) (*terraform.InstanceDiff, error) {
+			if diff == nil || diff.Empty() || diff.Destroy || diff.Attributes == nil {
+				return diff, nil
+			}
+			nameDiff, ok := diff.Attributes["name"]
+			if !ok {
+				return diff, nil
+			}
+			if strings.TrimSuffix(nameDiff.New, ".") == strings.TrimSuffix(nameDiff.Old, ".") {
+				delete(diff.Attributes, "name")
+			}
+			return diff, nil
+		}
 	})
 	p.AddResourceConfigurator("aws_route53_vpc_association_authorization", func(r *config.Resource) {
 		r.References["zone_id"] = config.Reference{

examples/route53/cluster/v1beta1/record-with-dot.yaml

@@ -0,0 +1,34 @@
+# SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
+#
+# SPDX-License-Identifier: CC0-1.0
+
+apiVersion: route53.aws.upbound.io/v1beta1
+kind: Record
+metadata:
+  annotations:
+    meta.upbound.io/example-id: route53/v1beta1/record
+  labels:
+    testing.upbound.io/example-name: example
+  name: example-with-dot
+spec:
+  forProvider:
+    name: www.mycompany.test.
+    records:
+    - "dev.upbound.io"
+    ttl: 5
+    type: CNAME
+    zoneIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example
+---
+apiVersion: route53.aws.upbound.io/v1beta1
+kind: Zone
+metadata:
+  annotations:
+    meta.upbound.io/example-id: route53/v1beta1/record
+  labels:
+    testing.upbound.io/example-name: example
+  name: example-with-dot
+spec:
+  forProvider:
+    name: mycompany.test

examples/route53/cluster/v1beta1/record.yaml

@@ -5,6 +5,10 @@
 apiVersion: route53.aws.upbound.io/v1beta1
 kind: Record
 metadata:
+  annotations:
+    meta.upbound.io/example-id: route53/v1beta1/record
+  labels:
+    testing.upbound.io/example-name: example
   name: example
 spec:
   forProvider:
@@ -19,6 +23,8 @@ spec:
 apiVersion: route53.aws.upbound.io/v1beta1
 kind: Zone
 metadata:
+  annotations:
+    meta.upbound.io/example-id: route53/v1beta1/record
   labels:
     testing.upbound.io/example-name: example
   name: example

examples/route53/namespaced/v1beta1/record-with-dot.yaml

@@ -0,0 +1,36 @@
+# SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
+#
+# SPDX-License-Identifier: CC0-1.0
+
+apiVersion: route53.aws.m.upbound.io/v1beta1
+kind: Record
+metadata:
+  annotations:
+    meta.upbound.io/example-id: route53/v1beta1/record
+  labels:
+    testing.upbound.io/example-name: example
+  name: example-with-dot
+  namespace: upbound-system
+spec:
+  forProvider:
+    name: www.mycompany.test.
+    records:
+    - "dev.upbound.io"
+    ttl: 5
+    type: CNAME
+    zoneIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example
+---
+apiVersion: route53.aws.m.upbound.io/v1beta1
+kind: Zone
+metadata:
+  annotations:
+    meta.upbound.io/example-id: route53/v1beta1/record
+  labels:
+    testing.upbound.io/example-name: example
+  name: example-with-dot
+  namespace: upbound-system
+spec:
+  forProvider:
+    name: mycompany.test