v2.3.1 bugfix issue 59

janibashamd · May 3, 2023 · 269827e · 269827e
1 parent 688fd2a
commit 269827e
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 24 deletions.
diff --git a/arcadia/data.tf b/arcadia/data.tf
@@ -7,10 +7,12 @@ data "tfe_outputs" "eks" {
   workspace = "eks"
 }
 data "tfe_outputs" "nap" {
+  count = data.tfe_outputs.infra.values.nap ? 1 : 0
   organization = var.tf_cloud_organization
   workspace = "nap"
 }
 data "tfe_outputs" "nic" {
+  count = data.tfe_outputs.infra.values.nic ? 1 : 0
   organization = var.tf_cloud_organization
   workspace = "nic"
 }

diff --git a/arcadia/ingress.tf b/arcadia/ingress.tf
@@ -5,7 +5,8 @@ resource "kubernetes_ingress_v1" "arcadia-ingress" {
   spec {
     ingress_class_name = "nginx"
     rule {
-      host = try(data.tfe_outputs.nap.values.external_name, data.tfe_outputs.nic.values.external_name, "arcadia-cd-demo.sr.f5-cloud-demo.com")
+      #host = try(data.tfe_outputs.nap.values.external_name, data.tfe_outputs.nic.values.external_name, "arcadia-cd-demo.sr.f5-cloud-demo.com")
+      host = try(data.tfe_outputs.nap[0].values.external_name, data.tfe_outputs.nic[0].values.external_name)
       http {
         path {
           path = "/"

diff --git a/arcadia/locals.tf b/arcadia/locals.tf
@@ -1,6 +1,7 @@
 locals {
   project_prefix = data.tfe_outputs.infra.values.project_prefix
-  external_name = try(data.tfe_outputs.nap.values.external_name, data.tfe_outputs.nic.values.external_name, "arcadia-cd-demo.sr.f5-cloud-demo.com")
+  #external_name = try(data.tfe_outputs.nap.values.external_name, data.tfe_outputs.nic.values.external_name, "arcadia-cd-demo.sr.f5-cloud-demo.com")
+  external_name = try(data.tfe_outputs.nap[0].values.external_name, data.tfe_outputs.nic[0].values.external_name)
   aws_region = data.tfe_outputs.infra.values.aws_region
   host = data.tfe_outputs.eks.values.cluster_endpoint
   cluster_ca_certificate = data.tfe_outputs.eks.values.kubeconfig-certificate-authority-data

diff --git a/bigip-awaf/awaf.tf b/bigip-awaf/awaf.tf
@@ -1,7 +1,7 @@
 module "postbuild-config-awaf" {
   source  = "f5devcentral/postbuild-config/bigip//as3"
   version = "0.6.3"
-  count = var.create_awaf_config ? 1 : 0
+  #count = var.create_awaf_config ? 1 : 0
   bigip_user       = var.f5_username
   bigip_password   = var.aws_secretmanager_auth ? "" : random_string.password.result
   bigip_address    = module.bigip.mgmtPublicIP

diff --git a/bigip-awaf/terraform.tfvars b/bigip-awaf/terraform.tfvars
diff --git a/bigip-awaf/variables.tf b/bigip-awaf/variables.tf
@@ -30,15 +30,17 @@ variable "f5_password" {
 }
 
 #AWAF Config
+/*
 variable "create_awaf_config" {
   type        = bool
   default     = false
   description = "Set to true to create AWAF config"
 }
+*/
 variable "awaf_config_payload" {
     type        = string
     description = "AWAF Policy AS3"
-    default     = "/path/to/as/file"
+    default     = "awaf-config.json"
 }
 
 #App Server

diff --git a/infra/outputs.tf b/infra/outputs.tf
@@ -91,5 +91,15 @@ output "internal_sg_id" {
   value       = aws_security_group.internal.id
 }
 
-
-
+output "nap" {
+  value = var.nap
+}
+output "nic" {
+  value = var.nic
+}
+output "bigip" {
+  value = var.bigip
+}
+output "bigip-cis" {
+  value = var.bigip-cis
+}
diff --git a/infra/terraform.tfvars.examples b/infra/terraform.tfvars.examples
@@ -5,3 +5,8 @@ resource_owner = "You"
 #AWS INFRA
 aws_region     = "us-east-1"
 azs           = ["us-east-1a", "us-east-1b"]
+
+#Assets
+nic = false
+nap = false
+bigip = false
diff --git a/infra/variables.tf b/infra/variables.tf
@@ -57,4 +57,15 @@ variable "int_address_prefixes" {
   default     = ["10.1.20.0/24", "10.1.120.0/24"]
   description = "Internal subnet address prefixes"
 }
-
+variable "nap" {
+  type = bool
+}
+variable "nic" {
+  type = bool
+}
+variable "bigip" {
+  type = bool
+}
+variable "bigip-cis" {
+  type = bool
+}
diff --git a/nap/data.tf b/nap/data.tf
@@ -7,10 +7,12 @@ data "tfe_outputs" "eks" {
   workspace = "eks"
 }
 data "tfe_outputs" "bigip-base" {
+  count = data.tfe_outputs.infra.values.bigip ? 1 : 0
   organization = var.tf_cloud_organization
   workspace = "bigip-base"
 }
 data "tfe_outputs" "bigip-cis" {
+  count = data.tfe_outputs.infra.values.bigip-cis ? 1 : 0
   organization = var.tf_cloud_organization
   workspace = "bigip-cis"
 }
@@ -22,13 +24,4 @@ data "kubernetes_service_v1" "nginx-service" {
     name = try(format("%s-%s", helm_release.nginx-plus-ingress.0.name, helm_release.nginx-plus-ingress.0.chart), format("%s-%s", helm_release.nginx-plus-ingresslink.0.name, helm_release.nginx-plus-ingresslink.0.chart))
     namespace = try(helm_release.nginx-plus-ingress[0].namespace, helm_release.nginx-plus-ingresslink[0].namespace)
   }
-}
-/*
-data "kubernetes_service_v1" "nginx-service-link" {
-  count = local.bigip_cis ? 1 : 0
-  metadata {
-    name = try(format("%s-%s", helm_release.nginx-plus-ingresslink[0].name, helm_release.nginx-plus-ingresslink[0].chart), "")
-    namespace = try(helm_release.nginx-plus-ingresslink[0].namespace, "")
-  }
-}
-*/
+}
diff --git a/nic/data.tf b/nic/data.tf
@@ -7,10 +7,12 @@ data "tfe_outputs" "eks" {
   workspace = "eks"
 }
 data "tfe_outputs" "bigip-base" {
+  count = data.tfe_outputs.infra.values.bigip ? 1 : 0
   organization = var.tf_cloud_organization
   workspace = "bigip-base"
 }
 data "tfe_outputs" "bigip-cis" {
+  count = data.tfe_outputs.infra.values.bigip-cis ? 1 : 0
   organization = var.tf_cloud_organization
   workspace = "bigip-cis"
 }

diff --git a/xc/data.tf b/xc/data.tf
@@ -3,14 +3,17 @@ data "tfe_outputs" "infra" {
   workspace = "infra"
 }
 data "tfe_outputs" "bigip" {
+  count = data.tfe_outputs.infra.values.bigip ? 1 : 0
   organization = var.tf_cloud_organization
   workspace = "bigip-base"
 }
 data "tfe_outputs" "nap" {
+  count = data.tfe_outputs.infra.values.nap ? 1 : 0
   organization = var.tf_cloud_organization
   workspace = "nap"
 }
 data "tfe_outputs" "nic" {
+  count = data.tfe_outputs.infra.values.nic ? 1 : 0
   organization = var.tf_cloud_organization
   workspace = "nic"
 }
diff --git a/xc/locals.tf b/xc/locals.tf
@@ -1,9 +1,12 @@
 locals {
   project_prefix = data.tfe_outputs.infra.values.project_prefix
   build_suffix = data.tfe_outputs.infra.values.build_suffix
-  origin_bigip = try(data.tfe_outputs.bigip.values.bigip_public_vip, "")
-  origin_nginx = try(data.tfe_outputs.nap.values.external_name, data.tfe_outputs.nic.values.external_name, "")
+  #59origin_bigip = try(data.tfe_outputs.bigip.values.bigip_public_vip, "")
+  #59origin_nginx = try(data.tfe_outputs.nap.values.external_name, data.tfe_outputs.nic.values.external_name, "")
+  origin_bigip = try(data.tfe_outputs.bigip[0].values.bigip_public_vip, "")
+  origin_nginx = try(data.tfe_outputs.nap[0].values.external_name, data.tfe_outputs.nic[0].values.external_name, "")
   origin_server = "${coalesce(local.origin_bigip, local.origin_nginx)}"
-  origin_port = try(data.tfe_outputs.nap.values.external_port, data.tfe_outputs.nic.values.external_port, "80")
+  #59origin_port = try(data.tfe_outputs.nap.values.external_port, data.tfe_outputs.nic.values.external_port, "80")
+  origin_port = try(data.tfe_outputs.nap[0].values.external_port, data.tfe_outputs.nic[0].values.external_port, "80")
   dns_origin_pool = local.origin_nginx != "" ? true : false 
 }