Skip to content

fixing deprecated vpc variable and transfer_server_ssh_key #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fixing deprecated vpc variable and transfer_server_ssh_key #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a15f074
fixing deprecated vpc variable and transfer_server_ssh_key
Oct 16, 2024
224c1c0
fixed more issues, duplicat iam role,policy and deprication warnings
Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 26 additions & 13 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,16 @@ data "aws_iam_policy_document" "assume_role_policy" {
resource "aws_iam_role" "s3_access_for_sftp_users" {
for_each = var.enabled ? local.user_names_map : {}

name = module.labels.id
assume_role_policy = join("", data.aws_iam_policy_document.assume_role_policy[*].json)
managed_policy_arns = [aws_iam_policy.s3_access_for_sftp_users[each.value.user_name].arn]
name = module.labels.id
assume_role_policy = join("", data.aws_iam_policy_document.assume_role_policy[*].json)
}

resource "aws_iam_policy_attachment" "s3_access_for_sftp_users" {
for_each = var.enabled ? local.user_names_map : {}

name = module.labels.id
policy_arn = aws_iam_policy.s3_access_for_sftp_users[each.value.user_name].arn
roles = [aws_iam_role.s3_access_for_sftp_users[each.value.user_name].name]
}

resource "aws_iam_policy" "s3_access_for_sftp_users" {
Expand All @@ -149,7 +156,7 @@ resource "aws_iam_policy" "s3_access_for_sftp_users" {
resource "aws_iam_policy" "logging" {
count = var.enabled ? 1 : 0

name = module.labels.id
name = format("%s-logging", module.labels.id)
policy = join("", data.aws_iam_policy_document.logging[*].json)

tags = module.labels.tags
Expand All @@ -158,13 +165,19 @@ resource "aws_iam_policy" "logging" {
resource "aws_iam_role" "logging" {
count = var.enabled ? 1 : 0

name = module.labels.id
assume_role_policy = join("", data.aws_iam_policy_document.assume_role_policy[*].json)
managed_policy_arns = [join("", aws_iam_policy.logging[*].arn)]
name = format("%s-logging", module.labels.id)
assume_role_policy = join("", data.aws_iam_policy_document.assume_role_policy[*].json)

tags = module.labels.tags
}

resource "aws_iam_role_policy_attachment" "logging" {
count = var.enabled ? 1 : 0

policy_arn = join("", aws_iam_policy.logging[*].arn)
role = aws_iam_role.logging[0].name
}

##----------------------------------------------------------------------------------
# Module : AWS TRANSFER SERVER
# Description : Provides a AWS Transfer Server resource.
Expand Down Expand Up @@ -240,10 +253,10 @@ resource "aws_transfer_user" "transfer_server_user" {
##----------------------------------------------------------------------------------

resource "aws_transfer_ssh_key" "transfer_server_ssh_key" {
count = var.enabled ? length(var.sftp_users) : 0
for_each = var.enabled ? { for user in var.sftp_users : user.user_name => user } : {}
server_id = join("", aws_transfer_server.transfer_server[*].id)
user_name = aws_transfer_user.transfer_server_user[count.index].user_name
body = aws_transfer_user.transfer_server_user[count.index].public_key
user_name = aws_transfer_user.transfer_server_user[each.value.user_name].user_name
body = each.value.public_key
}


Expand All @@ -253,9 +266,9 @@ resource "aws_transfer_ssh_key" "transfer_server_ssh_key" {
##----------------------------------------------------------------------------------

resource "aws_eip" "sftp" {
count = var.enabled && var.eip_enabled ? length(var.subnet_ids) : 0
vpc = local.is_vpc
tags = module.labels.tags
count = var.enabled && var.eip_enabled ? length(var.subnet_ids) : 0
domain = local.is_vpc
tags = module.labels.tags
}

##----------------------------------------------------------------------------------
Expand Down