terraform: remove okta, github apps (now preset apps) (#11)

clstokes · web-flow · commit 8ad515a32355 · 2024-04-15T15:11:42.000-07:00
diff --git a/terraform/aws/aws-ec2-autoscaling-dual-subnet/main.tf b/terraform/aws/aws-ec2-autoscaling-dual-subnet/main.tf
@@ -71,10 +71,8 @@ module "tailscale_aws_ec2_autoscaling" {
   ]
 
   tailscale_advertise_connector = true
-  # tailscale_advertise_github_service_names = [
-  #   "api",
-  #   "packages",
-  #   "website",
+  # tailscale_advertise_aws_service_names = [
+  #   "GLOBALACCELERATOR",
   # ]
 
   depends_on = [
diff --git a/terraform/aws/aws-ec2-autoscaling/main.tf b/terraform/aws/aws-ec2-autoscaling/main.tf
@@ -55,24 +55,15 @@ module "tailscale_aws_ec2_autoscaling" {
   tailscale_set_preferences     = var.tailscale_set_preferences
   tailscale_ssh                 = true
   tailscale_advertise_exit_node = true
-  tailscale_advertise_connector = true
 
   tailscale_advertise_routes = [
     module.vpc.vpc_cidr_block,
   ]
 
-  tailscale_advertise_aws_service_names = [
-    "GLOBALACCELERATOR",
-  ]
-  tailscale_advertise_github_service_names = [
-    "api",
-    "packages",
-    "website",
-  ]
-  tailscale_advertise_okta_cell_names = [
-    "us_cell_1",
-    "emea_cell_2",
-  ]
+  tailscale_advertise_connector = true
+  # tailscale_advertise_aws_service_names = [
+  #   "GLOBALACCELERATOR",
+  # ]
 
   depends_on = [
     module.vpc.natgw_ids, # ensure NAT gateway is available before instance provisioning - primarily for private subnets
diff --git a/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/main.tf b/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/main.tf
@@ -53,11 +53,6 @@ module "tailscale_aws_ec2" {
   )
 
   tailscale_advertise_connector = true
-  # tailscale_advertise_github_service_names = [
-  #   "api",
-  #   "packages",
-  #   "website",
-  # ]
 
   depends_on = [
     module.vpc.natgw_ids, # ensure NAT gateway is available before instance provisioning - primarily for private subnets
diff --git a/terraform/aws/aws-ec2-instance/main.tf b/terraform/aws/aws-ec2-instance/main.tf
@@ -50,7 +50,7 @@ module "tailscale_aws_ec2" {
   ]
 
   tailscale_advertise_connector = true
-  # tailscale_advertise_github_service_names = [
+  # tailscale_advertise_aws_service_names = [
   #   "GLOBALACCELERATOR",
   # ]
 
diff --git a/terraform/aws/internal-modules/aws-ec2-autoscaling/main.tf b/terraform/aws/internal-modules/aws-ec2-autoscaling/main.tf
@@ -8,10 +8,8 @@ module "tailscale_install_scripts" {
   tailscale_set_preferences     = var.tailscale_set_preferences
   tailscale_ssh                 = var.tailscale_ssh
 
-  tailscale_advertise_routes               = var.tailscale_advertise_routes
-  tailscale_advertise_aws_service_names    = var.tailscale_advertise_aws_service_names
-  tailscale_advertise_github_service_names = var.tailscale_advertise_github_service_names
-  tailscale_advertise_okta_cell_names      = var.tailscale_advertise_okta_cell_names
+  tailscale_advertise_routes            = var.tailscale_advertise_routes
+  tailscale_advertise_aws_service_names = var.tailscale_advertise_aws_service_names
 
   additional_before_scripts = var.additional_before_scripts
   additional_after_scripts  = var.additional_after_scripts
diff --git a/terraform/aws/internal-modules/aws-ec2-autoscaling/variables-tailscale-install-scripts.tf b/terraform/aws/internal-modules/aws-ec2-autoscaling/variables-tailscale-install-scripts.tf
@@ -57,13 +57,3 @@ variable "tailscale_advertise_aws_service_names" {
   type        = set(string)
   default     = []
 }
-variable "tailscale_advertise_github_service_names" {
-  description = "List of GitHub Services to retrieve IP prefixes for - e.g. ['web','api']"
-  type        = set(string)
-  default     = []
-}
-variable "tailscale_advertise_okta_cell_names" {
-  description = "List of Okta cells to retrieve IP prefixes for - e.g. ['us_cell_1','emea_cell_2']"
-  type        = set(string)
-  default     = []
-}
diff --git a/terraform/aws/internal-modules/aws-ec2-instance/main.tf b/terraform/aws/internal-modules/aws-ec2-instance/main.tf
@@ -8,10 +8,8 @@ module "tailscale_install_scripts" {
   tailscale_set_preferences     = var.tailscale_set_preferences
   tailscale_ssh                 = var.tailscale_ssh
 
-  tailscale_advertise_routes               = var.tailscale_advertise_routes
-  tailscale_advertise_aws_service_names    = var.tailscale_advertise_aws_service_names
-  tailscale_advertise_github_service_names = var.tailscale_advertise_github_service_names
-  tailscale_advertise_okta_cell_names      = var.tailscale_advertise_okta_cell_names
+  tailscale_advertise_routes            = var.tailscale_advertise_routes
+  tailscale_advertise_aws_service_names = var.tailscale_advertise_aws_service_names
 
   additional_before_scripts = var.additional_before_scripts
   additional_after_scripts  = var.additional_after_scripts
diff --git a/terraform/aws/internal-modules/aws-ec2-instance/variables-tailscale-install-scripts.tf b/terraform/aws/internal-modules/aws-ec2-instance/variables-tailscale-install-scripts.tf
@@ -57,13 +57,3 @@ variable "tailscale_advertise_aws_service_names" {
   type        = set(string)
   default     = []
 }
-variable "tailscale_advertise_github_service_names" {
-  description = "List of GitHub Services to retrieve IP prefixes for - e.g. ['web','api']"
-  type        = set(string)
-  default     = []
-}
-variable "tailscale_advertise_okta_cell_names" {
-  description = "List of Okta cells to retrieve IP prefixes for - e.g. ['us_cell_1','emea_cell_2']"
-  type        = set(string)
-  default     = []
-}
diff --git a/terraform/azure/azure-linux-vm/main.tf b/terraform/azure/azure-linux-vm/main.tf
@@ -66,11 +66,6 @@ module "tailscale_azure_linux_virtual_machine" {
   tailscale_advertise_routes = module.network.vnet_address_space
 
   tailscale_advertise_connector = true
-  # tailscale_advertise_github_service_names = [
-  #   "api",
-  #   "packages",
-  #   "website",
-  # ]
 
   depends_on = [
     module.network.natgw_ids, # for private subnets - ensure NAT gateway is available before instance provisioning
diff --git a/terraform/azure/internal-modules/azure-linux-vm/main.tf b/terraform/azure/internal-modules/azure-linux-vm/main.tf
@@ -8,10 +8,8 @@ module "tailscale_install_scripts" {
   tailscale_set_preferences     = var.tailscale_set_preferences
   tailscale_ssh                 = var.tailscale_ssh
 
-  tailscale_advertise_routes               = var.tailscale_advertise_routes
-  tailscale_advertise_aws_service_names    = var.tailscale_advertise_aws_service_names
-  tailscale_advertise_github_service_names = var.tailscale_advertise_github_service_names
-  tailscale_advertise_okta_cell_names      = var.tailscale_advertise_okta_cell_names
+  tailscale_advertise_routes            = var.tailscale_advertise_routes
+  tailscale_advertise_aws_service_names = var.tailscale_advertise_aws_service_names
 
   additional_before_scripts = var.additional_before_scripts
   additional_after_scripts  = var.additional_after_scripts
diff --git a/terraform/azure/internal-modules/azure-linux-vm/variables-tailscale-install-scripts.tf b/terraform/azure/internal-modules/azure-linux-vm/variables-tailscale-install-scripts.tf
@@ -57,13 +57,3 @@ variable "tailscale_advertise_aws_service_names" {
   type        = set(string)
   default     = []
 }
-variable "tailscale_advertise_github_service_names" {
-  description = "List of GitHub Services to retrieve IP prefixes for - e.g. ['web','api']"
-  type        = set(string)
-  default     = []
-}
-variable "tailscale_advertise_okta_cell_names" {
-  description = "List of Okta cells to retrieve IP prefixes for - e.g. ['us_cell_1','emea_cell_2']"
-  type        = set(string)
-  default     = []
-}
diff --git a/terraform/google/google-compute-instance/main.tf b/terraform/google/google-compute-instance/main.tf
@@ -59,11 +59,6 @@ module "tailscale_instance" {
   tailscale_advertise_routes = module.vpc.subnets_ips
 
   tailscale_advertise_connector = true
-  # tailscale_advertise_github_service_names = [
-  #   "api",
-  #   "packages",
-  #   "website",
-  # ]
 
   depends_on = [
     module.vpc.nat_ids, # ensure NAT gateway is available before instance provisioning - primarily for private subnets
diff --git a/terraform/google/internal-modules/google-compute-instance/main.tf b/terraform/google/internal-modules/google-compute-instance/main.tf
@@ -8,10 +8,8 @@ module "tailscale_install_scripts" {
   tailscale_set_preferences     = var.tailscale_set_preferences
   tailscale_ssh                 = var.tailscale_ssh
 
-  tailscale_advertise_routes               = var.tailscale_advertise_routes
-  tailscale_advertise_aws_service_names    = var.tailscale_advertise_aws_service_names
-  tailscale_advertise_github_service_names = var.tailscale_advertise_github_service_names
-  tailscale_advertise_okta_cell_names      = var.tailscale_advertise_okta_cell_names
+  tailscale_advertise_routes            = var.tailscale_advertise_routes
+  tailscale_advertise_aws_service_names = var.tailscale_advertise_aws_service_names
 
   additional_before_scripts = var.additional_before_scripts
   additional_after_scripts  = var.additional_after_scripts
diff --git a/terraform/google/internal-modules/google-compute-instance/variables-tailscale-install-scripts.tf b/terraform/google/internal-modules/google-compute-instance/variables-tailscale-install-scripts.tf
@@ -57,13 +57,3 @@ variable "tailscale_advertise_aws_service_names" {
   type        = set(string)
   default     = []
 }
-variable "tailscale_advertise_github_service_names" {
-  description = "List of GitHub Services to retrieve IP prefixes for - e.g. ['web','api']"
-  type        = set(string)
-  default     = []
-}
-variable "tailscale_advertise_okta_cell_names" {
-  description = "List of Okta cells to retrieve IP prefixes for - e.g. ['us_cell_1','emea_cell_2']"
-  type        = set(string)
-  default     = []
-}
diff --git a/terraform/internal-modules/tailscale-advertise-routes/github.tf b/terraform/internal-modules/tailscale-advertise-routes/github.tf
diff --git a/terraform/internal-modules/tailscale-advertise-routes/main.tf b/terraform/internal-modules/tailscale-advertise-routes/main.tf
@@ -3,15 +3,11 @@ locals {
     # boolean - do we have any routes to advertise?
     length(var.tailscale_advertise_routes)
     + length(var.tailscale_advertise_aws_service_names)
-    + length(var.tailscale_advertise_github_service_names)
-    + length(var.tailscale_advertise_okta_cell_names)
   ) == 0
 
   saas_routes_to_advertise = (
     # boolean - do we have any **SaaS** routes to advertise?
     length(var.tailscale_advertise_aws_service_names)
-    + length(var.tailscale_advertise_github_service_names)
-    + length(var.tailscale_advertise_okta_cell_names)
   ) == 0
 
   advertise_routes_script = local.routes_to_advertise ? "" : templatefile(
diff --git a/terraform/internal-modules/tailscale-advertise-routes/okta.tf b/terraform/internal-modules/tailscale-advertise-routes/okta.tf
diff --git a/terraform/internal-modules/tailscale-advertise-routes/outputs.tf b/terraform/internal-modules/tailscale-advertise-routes/outputs.tf
@@ -1,13 +1,11 @@
 /**
- * See other files for vendor-specific variables/outputs - `aws.tf`, `github.tf`, etc.
+ * See other files for vendor-specific variables/outputs - `aws.tf`, etc.
  */
 
 output "routes_script" {
   description = "Sript to fetch, parse, and save routes to `var.routes_file_to_append`"
   value = join("\n", compact([
     local.aws_routes_script,
-    local.github_routes_script,
-    local.okta_routes_script,
     local.advertise_routes_script,
   ]))
 }
diff --git a/terraform/internal-modules/tailscale-advertise-routes/scripts/get-routes-github.tftpl b/terraform/internal-modules/tailscale-advertise-routes/scripts/get-routes-github.tftpl
diff --git a/terraform/internal-modules/tailscale-advertise-routes/scripts/get-routes-okta.tftpl b/terraform/internal-modules/tailscale-advertise-routes/scripts/get-routes-okta.tftpl
diff --git a/terraform/internal-modules/tailscale-advertise-routes/variables.tf b/terraform/internal-modules/tailscale-advertise-routes/variables.tf
@@ -1,5 +1,5 @@
 /**
- * See other files for vendor-specific variables/outputs - `aws.tf`, `github.tf`, etc.
+ * See other files for vendor-specific variables/outputs - `aws.tf`, etc.
  */
 
 variable "tailscale_advertise_routes_from_file_on_host" {
diff --git a/terraform/internal-modules/tailscale-install-scripts/main.tf b/terraform/internal-modules/tailscale-install-scripts/main.tf
@@ -54,6 +54,4 @@ module "tailscale-advertise-routes" {
 
   tailscale_advertise_routes_from_file_on_host = "/root/tailscale-routes-to-advertise.txt"
   tailscale_advertise_aws_service_names        = var.tailscale_advertise_aws_service_names
-  tailscale_advertise_github_service_names     = var.tailscale_advertise_github_service_names
-  tailscale_advertise_okta_cell_names          = var.tailscale_advertise_okta_cell_names
 }
diff --git a/terraform/internal-modules/tailscale-install-scripts/variables.tf b/terraform/internal-modules/tailscale-install-scripts/variables.tf
@@ -57,13 +57,3 @@ variable "tailscale_advertise_aws_service_names" {
   type        = set(string)
   default     = []
 }
-variable "tailscale_advertise_github_service_names" {
-  description = "List of GitHub Services to retrieve IP prefixes for - e.g. ['web','api']"
-  type        = set(string)
-  default     = []
-}
-variable "tailscale_advertise_okta_cell_names" {
-  description = "List of Okta cells to retrieve IP prefixes for - e.g. ['us_cell_1','emea_cell_2']"
-  type        = set(string)
-  default     = []
-}

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ module "tailscale_aws_ec2" {`
`50`	`50`	`]`
`51`	`51`
`52`	`52`	`tailscale_advertise_connector = true`
`53`		`- # tailscale_advertise_github_service_names = [`
	`53`	`+ # tailscale_advertise_aws_service_names = [`
`54`	`54`	`# "GLOBALACCELERATOR",`
`55`	`55`	`# ]`
`56`	`56`