Merge pull request #37 from opzkit/type_for_permissions

Type for permissions
opzkit · Sep 9, 2022 · 2d50909 · 2d50909
2 parents f837ae5 + b29b034
commit 2d50909
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/examples/additional_nodes/provider.tf b/examples/additional_nodes/provider.tf
@@ -6,7 +6,7 @@ provider "aws" {
   skip_requesting_account_id  = true
   skip_credentials_validation = true
   skip_metadata_api_check     = true
-  s3_force_path_style         = true
+  s3_use_path_style           = true
   region                      = "eu-west-1"
   access_key                  = "mock_access_key"
   secret_key                  = "mock_secret_key"

diff --git a/examples/basic/provider.tf b/examples/basic/provider.tf
@@ -6,7 +6,7 @@ provider "aws" {
   skip_requesting_account_id  = true
   skip_credentials_validation = true
   skip_metadata_api_check     = true
-  s3_force_path_style         = true
+  s3_use_path_style           = true
   region                      = "eu-west-1"
   access_key                  = "mock_access_key"
   secret_key                  = "mock_secret_key"

diff --git a/examples/policies/provider.tf b/examples/policies/provider.tf
@@ -6,7 +6,7 @@ provider "aws" {
   skip_requesting_account_id  = true
   skip_credentials_validation = true
   skip_metadata_api_check     = true
-  s3_force_path_style         = true
+  s3_use_path_style           = true
   region                      = "eu-west-1"
   access_key                  = "mock_access_key"
   secret_key                  = "mock_secret_key"

diff --git a/providers.tf b/providers.tf
@@ -9,4 +9,5 @@ terraform {
       version = "~>1.23.5"
     }
   }
+  experiments = [module_variable_optional_attrs]
 }
diff --git a/vars.tf b/vars.tf
@@ -155,7 +155,14 @@ variable "aws_oidc_provider" {
 }
 
 variable "service_account_external_permissions" {
-  type        = any
+  type = list(object({
+    name      = string
+    namespace = string
+    aws = object({
+      inline_policy = optional(string)
+      policy_ar_ns  = optional(list(string))
+    })
+  }))
   default     = []
   description = "External permissions for Service Accounts (IRSA), https://kops.sigs.k8s.io/cluster_spec/#service-account-issuer-discovery-and-aws-iam-roles-for-service-accounts-irsa"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,5 @@ terraform { @@
           version = "~>1.23.5"
         }
       }
+      experiments = [module_variable_optional_attrs]
     }