simplify export statement

Author: athornton

environment/deployments/science-platform/env/dev.tfvars

@@ -113,12 +113,8 @@ netapp_definitions = [
       weekly_backup_limit = 5
       monthly_backup_limit = 12
     }
-    export_policy_rules = [
-      {
-        has_root_access = true
-        access_type = "READ_WRITE"
-      }
-    ]
+    has_root_access = true
+    access_type = "READ_WRITE"
     default_user_quota_mib = 5000
   },
   { name = "project"
@@ -150,12 +146,8 @@ netapp_definitions = [
       weekly_backup_limit = 5
       monthly_backup_limit = 12
     }
-    export_policy_rules = [
-      {
-        has_root_access = true
-        access_type = "READ_WRITE"
-      }
-    ]    
+    has_root_access = true
+    access_type = "READ_WRITE"
     default_user_quota_mib = 5000
   },
   { name = "scratch"
@@ -188,12 +180,8 @@ netapp_definitions = [
       weekly_backup_limit = 0
       monthly_backup_limit = 0
     }    
-    export_policy_rules = [
-      {
-        has_root_access = true
-        access_type = "READ_WRITE"
-      }
-    ]
+    has_root_access = true
+    access_type = "READ_WRITE"
     default_user_quota_mib = 5000
   }
 ]

environment/deployments/science-platform/variables.tf

@@ -263,14 +263,9 @@ variable "netapp_definitions" {
       weekly_backup_limit  = optional(number)
       monthly_backup_limit = optional(number)
     }))
-    export_policy_rules = optional(list(object({
-      allowed_clients = optional(string)
-      has_root_access = optional(bool, false)
-      access_type = optional(string) # READ_ONLY, READ_WRITE, READ_NONE
-      nfsv3 = optional(bool, true)
-      nfsv4 = optional(bool, true)
-      # Not bothering with Kerberos 5 options
-    })))
+    # allowed_clients = string #  Derived from subnets
+    has_root_access = bool
+    access_type = string
     default_user_quota_mib = optional(number)
   }))
 }

modules/netapp_volumes/main.tf

@@ -94,30 +94,13 @@ resource "google_netapp_volume" "instance" {
   }
 
   # Here's the tricky bit
-  dynamic "export_policy" {
-    for_each = each.value.export_policy_rules == null ? [] : ["export_policy_rules"]
-    content {
-      dynamic "rules" {
-        for_each = each.value.export_policy_rules == null ? {} : each.value.export_policy_rules
-	content {
-	  allowed_clients = "10.129.0.0/16" # var.allowed_ips
-	  has_root_access = lookup(rules.value, "has_root_access")
-	  access_type     = lookup(rules.value, "access_type")
-	  nfsv3           = true
-	  nfsv4           = true
-        }
-      }
+  export_policy {
+    rules {
+      allowed_clients = var.allowed_ips
+      has_root_access = each.value.has_root_access
+      access_type     = each.value.access_type
     }
   }
-  # export_policy {
-  #   rules {
-  #     nfsv3 = true
-  #     nfsv4 = true
-  #     has_root_access = true
-  #     access_type = "READ_WRITE"
-  #     allowed_clients = "10.129.0.0/16"
-  #   }
-  # }
 }
 
 resource "google_netapp_backup_policy" "instance" {

modules/netapp_volumes/variables.tf

@@ -59,13 +59,13 @@ variable "definitions" {
 	hour = optional(number,0)
       }))
       weekly_schedule = optional(object({
-	snapshots_to_keep = number,
+	snapshots_to_keep = number
 	minute = optional(number,0)
 	hour = optional(number,0)
 	day = optional(string, "Sunday")
       })) 
       monthly_schedule = optional(object({
-	snapshots_to_keep = number,
+	snapshots_to_keep = number
 	minute = optional(number,0)
 	hour = optional(number,0)
 	days = optional(string, "1")
@@ -77,11 +77,9 @@ variable "definitions" {
       weekly_backup_limit  = optional(number)
       monthly_backup_limit = optional(number)
     }))
-    export_policy_rules = optional(list(object({
-      allowed_clients = string
-      has_root_access = bool
-      access_type = string
-    })))
+    # allowed_clients = string  # Derived from subnets
+    has_root_access = bool
+    access_type = string
     default_user_quota_mib = optional(number)
   }))
 }