resource/aws_transfer_user: add home_directory_type and home_directory_mappings arguments #13591

quinyx-tjeerd · 2020-06-03T12:08:50Z

Community Note

Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Original PR:
#11483

I resolved the conflict

Release note for CHANGELOG:

Add home_directory_type and home_directory_mappings arguments to aws_transfer_user resource

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccAWSTransferUser_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./... -v -count 1 -parallel 20 -run=TestAccAWSTransferUser_ -timeout 120m
?   	github.com/terraform-providers/terraform-provider-aws	[no test files]
=== RUN   TestAccAWSTransferUser_basic
=== PAUSE TestAccAWSTransferUser_basic
=== RUN   TestAccAWSTransferUser_modifyWithOptions
=== PAUSE TestAccAWSTransferUser_modifyWithOptions
=== RUN   TestAccAWSTransferUser_disappears
=== PAUSE TestAccAWSTransferUser_disappears
=== RUN   TestAccAWSTransferUser_UserName_Validation
=== PAUSE TestAccAWSTransferUser_UserName_Validation
=== RUN   TestAccAWSTransferUser_homeDirectoryMappings
=== PAUSE TestAccAWSTransferUser_homeDirectoryMappings
=== CONT  TestAccAWSTransferUser_basic
=== CONT  TestAccAWSTransferUser_UserName_Validation
=== CONT  TestAccAWSTransferUser_disappears
=== CONT  TestAccAWSTransferUser_homeDirectoryMappings
=== CONT  TestAccAWSTransferUser_modifyWithOptions
--- PASS: TestAccAWSTransferUser_UserName_Validation (15.55s)
--- PASS: TestAccAWSTransferUser_disappears (45.52s)
--- PASS: TestAccAWSTransferUser_basic (49.50s)
--- PASS: TestAccAWSTransferUser_homeDirectoryMappings (73.62s)
--- PASS: TestAccAWSTransferUser_modifyWithOptions (112.28s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	113.609s
testing: warning: no tests to run
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws/internal/flatmap	0.421s [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags	0.671s [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws/internal/naming	0.890s [no tests to run]
?   	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/apigatewayv2/waiter	[no test files]
testing: warning: no tests to run
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/batch/equivalency	0.829s [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/eks/token	0.236s [no tests to run]
?   	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/guardduty/waiter	[no test files]
?   	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/iam/waiter	[no test files]
?   	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/kinesisanalytics/waiter	[no test files]
?   	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/kms/waiter	[no test files]
?   	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/neptune/waiter	[no test files]
?   	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/rds/waiter	[no test files]
?   	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/secretsmanager/waiter	[no test files]
?   	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/servicediscovery/waiter	[no test files]
?   	github.com/terraform-providers/terraform-provider-aws/aws/internal/service/workspaces/waiter	[no test files]
?   	github.com/terraform-providers/terraform-provider-aws/awsproviderlint	[no test files]
?   	github.com/terraform-providers/terraform-provider-aws/awsproviderlint/helper/awsprovidertype/keyvaluetags	[no test files]
testing: warning: no tests to run
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/awsproviderlint/passes	1.587s [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/awsproviderlint/passes/AWSAT001	2.180s [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/awsproviderlint/passes/AWSR001	0.613s [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/awsproviderlint/passes/AWSR002	1.231s [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/awsproviderlint/passes/fmtsprintfcallexpr	0.462s [no tests to run]
...

…s_transfer_user resource

sallaben · 2020-06-04T15:18:39Z

Thanks for the PR! Does this functionality differ from the functionality in #12599?

quinyx-tjeerd · 2020-06-04T15:27:52Z

This functionality is a subset of the pr you mention, which could (and possibly should) have been separated so it could add value sooner. I could revise the code so it matches the mentioned pr?

rprieto · 2020-08-07T11:14:30Z

Is it possible to merge this PR? It's indeed covered by 12599 - however that one implements several features and seems to be blocked on an unrelated topic, waiting for another PR itself (VPC endpoint). Without this functionality we must fall back to CloudFormation to manage AWS Transfer users, especially as directory mappings are not available in the AWS Console. Thanks.

dturnbu · 2020-08-17T15:09:36Z

Who is this "AWS Provider" guy and why hasn't he reviewed this PR? I've been waiting for this for weeks now and it looks like others have been waiting even longer.

How is it this simple, yet valuable fix hasn't made it into one of the several releases since this PRs creation?

quinyx-tjeerd · 2020-08-17T15:35:26Z

In case it helps you out, I worked around this issue by:
adding AWS cli to the image where terraform runs, and using local-exec.
this might or might not be an option for you, depending on where your terraform runs.

resource "aws_transfer_user" "sftp-users" {
  server_id = aws_transfer_server.server.id
  role      = aws_iam_role.sftp-user.arn
  user_name = "username"

  # This bit can be replaced once 'home-directory-type' and 'home-directory-mappings' are available in terraform aws provider
  provisioner "local-exec" {
    command = "aws transfer update-user --server-id $SERVER --user-name $USER --region $REGION --home-directory-type $HOME_DIR_TYPE --home-directory-mappings $HOME_DIR_MAPPINGS"

    environment = {
      SERVER            = aws_transfer_server.server.id
      USER              = "username"
      REGION            = var.region
      HOME_DIR_TYPE     = "LOGICAL"
      HOME_DIR_MAPPINGS = format("Entry=/,Target=/%s/%s", aws_s3_bucket.sftp-bucket.id, "username")
    }
  }
}

dturnbu · 2020-08-17T16:26:49Z

In case it helps you out, I worked around this issue by:
adding AWS cli to the image where terraform runs, and using local-exec.
this might or might not be an option for you, depending on where your terraform runs.

resource "aws_transfer_user" "sftp-users" {
  server_id = aws_transfer_server.server.id
  role      = aws_iam_role.sftp-user.arn
  user_name = "username"

  # This bit can be replaced once 'home-directory-type' and 'home-directory-mappings' are available in terraform aws provider
  provisioner "local-exec" {
    command = "aws transfer update-user --server-id $SERVER --user-name $USER --region $REGION --home-directory-type $HOME_DIR_TYPE --home-directory-mappings $HOME_DIR_MAPPINGS"

    environment = {
      SERVER            = aws_transfer_server.server.id
      USER              = "username"
      REGION            = var.region
      HOME_DIR_TYPE     = "LOGICAL"
      HOME_DIR_MAPPINGS = format("Entry=/,Target=/%s/%s", aws_s3_bucket.sftp-bucket.id, "username")
    }
  }
}

Thank you very much, I'll give it a shot! I'm trying to run this from Terraform Cloud, hopefully their executors allow local-exec operations.....

quinyx-tjeerd · 2020-08-18T06:45:42Z

Thank you very much, I'll give it a shot! I'm trying to run this from Terraform Cloud, hopefully their executors allow local-exec operations.....

I used Terraform Cloud before at a previous company, and local-exec was not the problem but i'd image you don't have AWS cli available in the images they run on 😅
and back then I haven't looked into the functionality / flexibility of providing your own images.

bflad

This looks good, thanks for the updates here, @quinyx-tjeerd 🚀

Output from acceptance testing:

--- PASS: TestAccAWSTransferUser_basic (20.00s)
--- PASS: TestAccAWSTransferUser_disappears (16.77s)
--- PASS: TestAccAWSTransferUser_homeDirectoryMappings (30.78s)
--- PASS: TestAccAWSTransferUser_modifyWithOptions (43.38s)
--- PASS: TestAccAWSTransferUser_UserName_Validation (8.93s)

bflad · 2020-09-21T14:16:26Z

aws/resource_aws_transfer_user_test.go

+
+resource "aws_iam_role_policy" "foo" {
+  name = "tf-test-transfer-user-iam-policy-%s"
+  role = "${aws_iam_role.foo.id}"


Nit: We are now using Terraform 0.12+ syntax in test configurations, will adjust on merge. 👍

ghost · 2020-09-24T22:16:07Z

This has been released in version 3.8.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

ghost · 2020-10-21T17:10:26Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

teraken0509 added 2 commits June 3, 2020 13:25

Add home_directory_mappings and home_directory_type attributes for aw…

0736ecf

…s_transfer_user resource

add validation setting

061b2a4

quinyx-tjeerd requested a review from a team June 3, 2020 12:08

anGie44 force-pushed the master branch from 54db70d to 48ba2f7 Compare July 21, 2020 18:26

bflad added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Sep 21, 2020

bflad self-assigned this Sep 21, 2020

bflad added this to the v3.8.0 milestone Sep 21, 2020

bflad approved these changes Sep 21, 2020

View reviewed changes

bflad merged commit 329e343 into hashicorp:master Sep 21, 2020

bflad added a commit that referenced this pull request Sep 21, 2020

Update CHANGELOG for #13591

1467b0e

bflad mentioned this pull request Sep 21, 2020

aws_transfer_user: Support "restricted" home directory #11632

Closed

ghost locked as resolved and limited conversation to collaborators Oct 21, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

resource/aws_transfer_user: add home_directory_type and home_directory_mappings arguments #13591

resource/aws_transfer_user: add home_directory_type and home_directory_mappings arguments #13591

quinyx-tjeerd commented Jun 3, 2020

sallaben commented Jun 4, 2020

quinyx-tjeerd commented Jun 4, 2020

rprieto commented Aug 7, 2020

dturnbu commented Aug 17, 2020

quinyx-tjeerd commented Aug 17, 2020

dturnbu commented Aug 17, 2020

quinyx-tjeerd commented Aug 18, 2020 •

edited

bflad left a comment

bflad Sep 21, 2020

ghost commented Sep 24, 2020

ghost commented Oct 21, 2020

resource/aws_transfer_user: add home_directory_type and home_directory_mappings arguments #13591

resource/aws_transfer_user: add home_directory_type and home_directory_mappings arguments #13591

Conversation

quinyx-tjeerd commented Jun 3, 2020

Community Note

sallaben commented Jun 4, 2020

quinyx-tjeerd commented Jun 4, 2020

rprieto commented Aug 7, 2020

dturnbu commented Aug 17, 2020

quinyx-tjeerd commented Aug 17, 2020

dturnbu commented Aug 17, 2020

quinyx-tjeerd commented Aug 18, 2020 • edited

bflad left a comment

Choose a reason for hiding this comment

bflad Sep 21, 2020

Choose a reason for hiding this comment

ghost commented Sep 24, 2020

ghost commented Oct 21, 2020

quinyx-tjeerd commented Aug 18, 2020 •

edited