From 3c408f11d62b7f15966aea55cb376119c074a735 Mon Sep 17 00:00:00 2001
From: "nada.jankovic" <nada.jankovic@monitoredsecurity.com>
Date: Wed, 8 Mar 2023 13:37:47 +0100
Subject: [PATCH] fix: Remove deprecated external-dns attributes

---
 modules/kubernetes-addons/external-dns/README.md    |  3 ---
 modules/kubernetes-addons/external-dns/data.tf      |  5 ++---
 modules/kubernetes-addons/external-dns/main.tf      |  6 ------
 modules/kubernetes-addons/external-dns/variables.tf | 11 -----------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/modules/kubernetes-addons/external-dns/README.md b/modules/kubernetes-addons/external-dns/README.md
index 7bd7d028cb..c3fc86e6a6 100644
--- a/modules/kubernetes-addons/external-dns/README.md
+++ b/modules/kubernetes-addons/external-dns/README.md
@@ -32,18 +32,15 @@ For complete project documentation, please visit the [ExternalDNS Github reposit
 |------|------|
 | [aws_iam_policy.external_dns](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_policy_document.external_dns_iam_policy_document](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
-| [aws_route53_zone.selected](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/route53_zone) | data source |
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_addon_context"></a> [addon\_context](#input\_addon\_context) | Input configuration for the addon | <pre>object({<br>    aws_caller_identity_account_id = string<br>    aws_caller_identity_arn        = string<br>    aws_eks_cluster_endpoint       = string<br>    aws_partition_id               = string<br>    aws_region_name                = string<br>    eks_cluster_id                 = string<br>    eks_oidc_issuer_url            = string<br>    eks_oidc_provider_arn          = string<br>    tags                           = map(string)<br>    irsa_iam_role_path             = string<br>    irsa_iam_permissions_boundary  = string<br>  })</pre> | n/a | yes |
-| <a name="input_domain_name"></a> [domain\_name](#input\_domain\_name) | [Deprecated - use `route53_zone_arns`] Domain name of the Route53 hosted zone to use with External DNS. | `string` | n/a | yes |
 | <a name="input_helm_config"></a> [helm\_config](#input\_helm\_config) | External DNS Helm Configuration | `any` | `{}` | no |
 | <a name="input_irsa_policies"></a> [irsa\_policies](#input\_irsa\_policies) | Additional IAM policies used for the add-on service account. | `list(string)` | `[]` | no |
 | <a name="input_manage_via_gitops"></a> [manage\_via\_gitops](#input\_manage\_via\_gitops) | Determines if the add-on should be managed via GitOps. | `bool` | `false` | no |
-| <a name="input_private_zone"></a> [private\_zone](#input\_private\_zone) | [Deprecated - use `route53_zone_arns`] Determines if referenced Route53 hosted zone is private. | `bool` | `false` | no |
 | <a name="input_route53_zone_arns"></a> [route53\_zone\_arns](#input\_route53\_zone\_arns) | List of Route53 zones ARNs which external-dns will have access to create/manage records | `list(string)` | `[]` | no |
 
 ## Outputs
diff --git a/modules/kubernetes-addons/external-dns/data.tf b/modules/kubernetes-addons/external-dns/data.tf
index fa167d3f47..3211e83ee2 100644
--- a/modules/kubernetes-addons/external-dns/data.tf
+++ b/modules/kubernetes-addons/external-dns/data.tf
@@ -1,10 +1,9 @@
 data "aws_iam_policy_document" "external_dns_iam_policy_document" {
   statement {
     effect = "Allow"
-    resources = distinct(concat(
-      [data.aws_route53_zone.selected.arn],
+    resources = distinct(
       var.route53_zone_arns
-    ))
+    )
     actions = [
       "route53:ChangeResourceRecordSets",
       "route53:ListResourceRecordSets",
diff --git a/modules/kubernetes-addons/external-dns/main.tf b/modules/kubernetes-addons/external-dns/main.tf
index 7f4eaab0a4..d228cc6f67 100644
--- a/modules/kubernetes-addons/external-dns/main.tf
+++ b/modules/kubernetes-addons/external-dns/main.tf
@@ -72,9 +72,3 @@ resource "aws_iam_policy" "external_dns" {
   policy      = data.aws_iam_policy_document.external_dns_iam_policy_document.json
   tags        = var.addon_context.tags
 }
-
-# TODO - remove at next breaking change
-data "aws_route53_zone" "selected" {
-  name         = var.domain_name
-  private_zone = var.private_zone
-}
diff --git a/modules/kubernetes-addons/external-dns/variables.tf b/modules/kubernetes-addons/external-dns/variables.tf
index 04353c13f7..e66df8b463 100644
--- a/modules/kubernetes-addons/external-dns/variables.tf
+++ b/modules/kubernetes-addons/external-dns/variables.tf
@@ -16,17 +16,6 @@ variable "irsa_policies" {
   default     = []
 }
 
-variable "domain_name" {
-  description = "[Deprecated - use `route53_zone_arns`] Domain name of the Route53 hosted zone to use with External DNS."
-  type        = string
-}
-
-variable "private_zone" {
-  description = "[Deprecated - use `route53_zone_arns`] Determines if referenced Route53 hosted zone is private."
-  type        = bool
-  default     = false
-}
-
 variable "route53_zone_arns" {
   description = "List of Route53 zones ARNs which external-dns will have access to create/manage records"
   type        = list(string)