Skip to content

Commit ccdcacc

Browse files
committed
update FSxN module - pre-commit hooks fixes
1 parent e2d2538 commit ccdcacc

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/main.tf

+4-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ resource "aws_iam_policy" "fsxn-csi-policy" {
2727
"Resource": "${data.aws_secretsmanager_secret.fsxn_password_secret.arn}"
2828
}
2929
]
30-
})
30+
})
3131
}
3232

3333
data "aws_secretsmanager_secret" "fsxn_password_secret" {
34-
name = "${var.addon_context.eks_cluster_id}-fsxn-secret"
34+
name = "${var.addon_context.eks_cluster_id}-fsxn-secret"
3535
depends_on = [ module.preprovision ]
3636
}
3737

@@ -82,8 +82,8 @@ resource "random_string" "suffix" {
8282
}
8383

8484
locals {
85-
k8s_service_account_namespace = "trident"
86-
k8s_service_account_name = "trident-controller"
85+
k8s_service_account_namespace = "trident"
86+
k8s_service_account_name = "trident-controller"
8787
}
8888

8989

@@ -93,5 +93,4 @@ module "preprovision" {
9393

9494
eks_cluster_id = var.eks_cluster_id
9595
tags = var.tags
96-
random_string = random_string.suffix.result
9796
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
output "environment_variables" {
22
description = "Environment variables to be added to the IDE shell"
33
value = {
4-
FSXN_SECRET_ARN = data.aws_secretsmanager_secret.fsxn_password_secret.arn
4+
FSXN_SECRET_ARN = data.aws_secretsmanager_secret.fsxn_password_secret.arn
55
}
66
}

manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/preprovision/main.tf

+4-5
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,19 @@ resource "random_string" "fsx_password" {
2626
min_numeric = 1
2727
min_special = 1
2828
min_upper = 1
29-
numeric = true
29+
numeric = true
3030
special = true
3131
override_special = "!"
3232
}
3333

3434
resource "aws_secretsmanager_secret" "fsxn_password_secret" {
35-
name = "${var.eks_cluster_id}-fsxn-secret"
36-
description = "FSxN CSI Driver Password"
35+
name = "${var.eks_cluster_id}-fsxn-secret"
36+
description = "FSxN CSI Driver Password"
3737
recovery_window_in_days = 0
38-
3938
}
4039

4140
resource "aws_secretsmanager_secret_version" "fsxn_password_secret" {
42-
secret_id = aws_secretsmanager_secret.fsxn_password_secret.id
41+
secret_id = aws_secretsmanager_secret.fsxn_password_secret.id
4342
secret_string = jsonencode({
4443
username = "vsadmin"
4544
password = "${random_string.fsx_password.result}"

manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/preprovision/vars.tf

+1-6
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,4 @@ variable "eks_cluster_id" {
88
variable "tags" {
99
description = "Tags to apply to AWS resources"
1010
type = any
11-
}
12-
13-
variable "random_string" {
14-
description = "value for random_string"
15-
type = string
16-
}
11+
}

0 commit comments

Comments
 (0)