remove classiclink params from module and examples (#75)

transient1 · web-flow · commit fa22c5b76149 · 2023-05-30T14:58:58.000-06:00
diff --git a/modules/single-cluster/variables.tf b/modules/single-cluster/variables.tf
@@ -47,10 +47,6 @@ variable "vpc_enable_dns_hostnames" {
   default = "true"
 }
 
-variable "vpc_enable_classiclink" {
-  default = "false"
-}
-
 ## Tagging Settings
 variable "extra_tags_global" {
   type        = map(string)
diff --git a/modules/single-cluster/vpc.tf b/modules/single-cluster/vpc.tf
@@ -4,7 +4,6 @@ resource "aws_vpc" "kube_vpc" {
   instance_tenancy     = var.vpc_instance_tenancy
   enable_dns_support   = var.vpc_enable_dns_support
   enable_dns_hostnames = var.vpc_enable_dns_hostnames
-  enable_classiclink   = var.vpc_enable_classiclink
   tags = merge(
     local.tags,
     {
diff --git a/tests/fixtures/terraform.1az.tfvars.example.output b/tests/fixtures/terraform.1az.tfvars.example.output
@@ -195,8 +195,6 @@ Terraform will perform the following actions:
       default_route_table_id:           <computed>
       default_security_group_id:        <computed>
       dhcp_options_id:                  <computed>
-      enable_classiclink:               "false"
-      enable_classiclink_dns_support:   <computed>
       enable_dns_hostnames:             "true"
       enable_dns_support:               "true"
       instance_tenancy:                 "default"
diff --git a/tests/fixtures/terraform.nat-gw.tfvars.example.output b/tests/fixtures/terraform.nat-gw.tfvars.example.output
@@ -477,8 +477,6 @@ Terraform will perform the following actions:
       default_route_table_id:           <computed>
       default_security_group_id:        <computed>
       dhcp_options_id:                  <computed>
-      enable_classiclink:               "false"
-      enable_classiclink_dns_support:   <computed>
       enable_dns_hostnames:             "true"
       enable_dns_support:               "true"
       instance_tenancy:                 "default"
diff --git a/tests/fixtures/terraform.s3ep.tfvars.example.output b/tests/fixtures/terraform.s3ep.tfvars.example.output
@@ -477,8 +477,6 @@ Terraform will perform the following actions:
       default_route_table_id:           <computed>
       default_security_group_id:        <computed>
       dhcp_options_id:                  <computed>
-      enable_classiclink:               "false"
-      enable_classiclink_dns_support:   <computed>
       enable_dns_hostnames:             "true"
       enable_dns_support:               "true"
       instance_tenancy:                 "default"
diff --git a/variables.tf b/variables.tf
@@ -45,10 +45,6 @@ variable "vpc_enable_dns_hostnames" {
   default = "true"
 }
 
-variable "vpc_enable_classiclink" {
-  default = "false"
-}
-
 variable "admin_subnet_parent_cidr" {
   description = "parent CIDR for the administrative subnets"
   default     = ".0.0/19"
@@ -149,7 +145,7 @@ variable "s3_vpc_endpoint_policy" {
   default     = <<POLICY
 {
     "Statement": [
-        {   
+        {
             "Sid": "FullAccess",
             "Action": "*",
             "Effect": "Allow",
diff --git a/vpc.tf b/vpc.tf
@@ -17,7 +17,6 @@ resource "aws_vpc" "default" {
   instance_tenancy     = var.vpc_instance_tenancy
   enable_dns_support   = var.vpc_enable_dns_support
   enable_dns_hostnames = var.vpc_enable_dns_hostnames
-  enable_classiclink   = var.vpc_enable_classiclink
   tags = merge(
     var.global_tags,
     {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ resource "aws_vpc" "kube_vpc" {`
`4`	`4`	`instance_tenancy = var.vpc_instance_tenancy`
`5`	`5`	`enable_dns_support = var.vpc_enable_dns_support`
`6`	`6`	`enable_dns_hostnames = var.vpc_enable_dns_hostnames`
`7`		`- enable_classiclink = var.vpc_enable_classiclink`
`8`	`7`	`tags = merge(`
`9`	`8`	`local.tags,`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ resource "aws_vpc" "default" {`
`17`	`17`	`instance_tenancy = var.vpc_instance_tenancy`
`18`	`18`	`enable_dns_support = var.vpc_enable_dns_support`
`19`	`19`	`enable_dns_hostnames = var.vpc_enable_dns_hostnames`
`20`		`- enable_classiclink = var.vpc_enable_classiclink`
`21`	`20`	`tags = merge(`
`22`	`21`	`var.global_tags,`
`23`	`22`	`{`