Merge branch 'main' into add_monitor_fsxn_with_arvest

Author: kcantrel

EKS/FSxN-as-PVC-for-EKS/terraform/fsx.tf

@@ -4,7 +4,7 @@ module "fsxn_rotate_secret" {
     source = "github.com/Netapp/FSx-ONTAP-samples-scripts/Management-Utilities/fsxn-rotate-secret/terraform"
     fsx_region = var.aws_region
     secret_region = var.aws_secrets_region
-    aws_account_id = var.aws_account_id
+    aws_account_id = data.aws_caller_identity.current.account_id
     secret_name_prefix = var.secret_name_prefix
     fsx_id = aws_fsx_ontap_file_system.eksfs.id
 }
@@ -28,7 +28,7 @@ module "svm_rotate_secret" {
     source = "github.com/Netapp/FSx-ONTAP-samples-scripts/Management-Utilities/fsxn-rotate-secret/terraform"
     fsx_region = var.aws_region
     secret_region = var.aws_secrets_region
-    aws_account_id = var.aws_account_id
+    aws_account_id = data.aws_caller_identity.current.account_id
     secret_name_prefix = var.secret_name_prefix
     svm_id = aws_fsx_ontap_storage_virtual_machine.ekssvm.id
 }

EKS/FSxN-as-PVC-for-EKS/terraform/variables.tf

@@ -1,16 +1,13 @@
 variable "aws_region" {
   description = "The AWS region where you want the resources deployed."
   type        = string
+  default     = "us-west-2"
 }
 
 variable "aws_secrets_region" {
   description = "The AWS region where you want the FSxN and SVM secrets stored within AWS Secrets Manager."
   type        = string
-}
-
-variable "aws_account_id" {
-  description = "The AWS account ID. Used to create very specific permissions in the IAM role for the EKS cluster."
-  type       = string
+  default     = "us-west-2"
 }
 
 variable "fsx_name" {
@@ -36,9 +33,9 @@ variable "fsxn_storage_capacity" {
 variable "fsxn_throughput_capacity" {
   description = "The throughput capacity to be allocated to the FSxN cluster. Must be 128, 256, 512, 1024, 2048, 4096."
   type        = string   # Set to a string so it can be used in a "contains()" function.
-  default     = 128
+  default     = "128"
   validation {
-    condition = contains([128, 256, 512, 1024, 2048, 4096], var.fsxn_throughput_capacity)
+    condition = contains(["128", "256", "512", "1024", "2048", "4096"], var.fsxn_throughput_capacity)
     error_message = "The throughput capacity must be 128, 256, 512, 1024, 2048, or 4096."
   }
 }

Management-Utilities/fsxn-rotate-secret/fsxn_rotate_secret.py

@@ -12,7 +12,7 @@
 import os
 import json
 
-charactersToExcludeInPassword = '/"\'\\'
+charactersToExcludeInPassword = '/"*\'\\'
 
 ################################################################################
 # This function is used to get the value of a tag from a list of tags.