WIP!: r/aws-athena-workgroup added

[marcotesch]

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" comments, they generate extra noise for pull request followers and do not help prioritize the request

Fixes #7650, #7667

Changes proposed in this pull request:

• Add new resource aws_athena_workgroup

This is now WIP, Test Output will be added when available

resource "aws_athena_workgroup" "hr_workgroup" {
    name                                  = "HR Workgroup"
    description                           = "Athena Workgroup for HR"
    bytes_scanned_cutoff_per_query        = "${var.cut_off_bytes}"
    enforce_workgroup_configuration       = true
    publish_cloudwatch_metrics_enabled    = true
    output_location                       = "s3://path/to/output"
    encryption_option                     = "SSE_KMS"
    kms_key                               = "${aws_kms_key.hr_kms_key.arn}"   
} 

First test(s) are written and running:

make testacc TEST=./aws TESTARGS='-run=TestAccAWSAthenaWorkGroup_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -parallel 20 -run=TestAccAWSAthenaWorkGroup_ -timeout 120m
=== RUN   TestAccAWSAthenaWorkGroup_basic
=== PAUSE TestAccAWSAthenaWorkGroup_basic
=== RUN   TestAccAWSAthenaWorkGroup_withDescription
=== PAUSE TestAccAWSAthenaWorkGroup_withDescription
=== RUN   TestAccAWSAthenaWorkGroup_withDescriptionUpdate
=== PAUSE TestAccAWSAthenaWorkGroup_withDescriptionUpdate
=== RUN   TestAccAWSAthenaWorkGroup_withBytesScannedCutoffPerQuery
=== PAUSE TestAccAWSAthenaWorkGroup_withBytesScannedCutoffPerQuery
=== RUN   TestAccAWSAthenaWorkGroup_withBytesScannedCutoffPerQueryUpdate
=== PAUSE TestAccAWSAthenaWorkGroup_withBytesScannedCutoffPerQueryUpdate
=== RUN   TestAccAWSAthenaWorkGroup_withEnforceWorkgroupConfiguration
=== PAUSE TestAccAWSAthenaWorkGroup_withEnforceWorkgroupConfiguration
=== RUN   TestAccAWSAthenaWorkGroup_withEnforceWorkgroupConfigurationUpdate
=== PAUSE TestAccAWSAthenaWorkGroup_withEnforceWorkgroupConfigurationUpdate
=== RUN   TestAccAWSAthenaWorkGroup_withPublishCloudWatchMetricsEnabled
=== PAUSE TestAccAWSAthenaWorkGroup_withPublishCloudWatchMetricsEnabled
=== RUN   TestAccAWSAthenaWorkGroup_withPublishCloudWatchMetricsEnabledUpdate
=== PAUSE TestAccAWSAthenaWorkGroup_withPublishCloudWatchMetricsEnabledUpdate
=== RUN   TestAccAWSAthenaWorkGroup_withOutputLocation
=== PAUSE TestAccAWSAthenaWorkGroup_withOutputLocation
=== RUN   TestAccAWSAthenaWorkGroup_withOutputLocationUpdate
=== PAUSE TestAccAWSAthenaWorkGroup_withOutputLocationUpdate
=== RUN   TestAccAWSAthenaWorkGroup_withSseS3Encryption
=== PAUSE TestAccAWSAthenaWorkGroup_withSseS3Encryption
=== RUN   TestAccAWSAthenaWorkGroup_withKmsEncryption
=== PAUSE TestAccAWSAthenaWorkGroup_withKmsEncryption
=== RUN   TestAccAWSAthenaWorkGroup_withKmsEncryptionUpdate
=== PAUSE TestAccAWSAthenaWorkGroup_withKmsEncryptionUpdate
=== CONT  TestAccAWSAthenaWorkGroup_basic
=== CONT  TestAccAWSAthenaWorkGroup_withPublishCloudWatchMetricsEnabled
=== CONT  TestAccAWSAthenaWorkGroup_withPublishCloudWatchMetricsEnabledUpdate
=== CONT  TestAccAWSAthenaWorkGroup_withKmsEncryptionUpdate
=== CONT  TestAccAWSAthenaWorkGroup_withKmsEncryption
=== CONT  TestAccAWSAthenaWorkGroup_withSseS3Encryption
=== CONT  TestAccAWSAthenaWorkGroup_withOutputLocationUpdate
=== CONT  TestAccAWSAthenaWorkGroup_withOutputLocation
=== CONT  TestAccAWSAthenaWorkGroup_withBytesScannedCutoffPerQueryUpdate
=== CONT  TestAccAWSAthenaWorkGroup_withEnforceWorkgroupConfigurationUpdate
=== CONT  TestAccAWSAthenaWorkGroup_withEnforceWorkgroupConfiguration
=== CONT  TestAccAWSAthenaWorkGroup_withDescriptionUpdate
=== CONT  TestAccAWSAthenaWorkGroup_withBytesScannedCutoffPerQuery
=== CONT  TestAccAWSAthenaWorkGroup_withDescription
--- PASS: TestAccAWSAthenaWorkGroup_basic (9.95s)
--- PASS: TestAccAWSAthenaWorkGroup_withSseS3Encryption (10.62s)
--- PASS: TestAccAWSAthenaWorkGroup_withPublishCloudWatchMetricsEnabled (11.73s)
--- PASS: TestAccAWSAthenaWorkGroup_withEnforceWorkgroupConfiguration (12.21s)
--- PASS: TestAccAWSAthenaWorkGroup_withBytesScannedCutoffPerQuery (12.51s)
--- PASS: TestAccAWSAthenaWorkGroup_withDescriptionUpdate (16.72s)
--- PASS: TestAccAWSAthenaWorkGroup_withBytesScannedCutoffPerQueryUpdate (16.98s)
--- PASS: TestAccAWSAthenaWorkGroup_withPublishCloudWatchMetricsEnabledUpdate (18.38s)
--- PASS: TestAccAWSAthenaWorkGroup_withEnforceWorkgroupConfigurationUpdate (25.56s)
--- PASS: TestAccAWSAthenaWorkGroup_withDescription (25.80s)
--- PASS: TestAccAWSAthenaWorkGroup_withOutputLocationUpdate (28.07s)
--- PASS: TestAccAWSAthenaWorkGroup_withOutputLocation (30.88s)
--- PASS: TestAccAWSAthenaWorkGroup_withKmsEncryption (32.30s)
--- PASS: TestAccAWSAthenaWorkGroup_withKmsEncryptionUpdate (48.41s)
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       48.450s

[marcotesch]

Added first TestCase, still working on create/update/read functionality.

#7667 might become an issue as the SDK does not allow to have an ARN for the WorkGroup, which is needed to list-tags. But still working on it.

[marcotesch]

@bflad : Got some Travis CI Problems with the govet/nillness checks you have fixed here how I might recover my branch from that?

[bflad]

@marcotesch the fixes need to be reviewed and merged into master first then we can restart the TravisCI build. You could also pull in my commits, but that could be troublesome if we change the implementation during review.

[marcotesch]

@marcotesch the fixes need to be reviewed and merged into master first then we can restart the TravisCI build. You could also pull in my commits, but that could be troublesome if we change the implementation during review.

Looks good now @bflad. I will keep working on this, probably tags will not be ready for the first release version and get added later on, if thats fine with you?

[florianlocqueneux]

Athena workgroups provide the ability to follow costs using tag allocation for specific processing, without the tags, workgroups are useless ( for my usage )

[marcotesch]

Athena workgroups provide the ability to follow costs using tag allocation for specific processing, without the tags, workgroups are useless ( for my usage )

@florianlocqueneux: For sure there are UseCases where Tags are needed. But lets look at the plain resource functionality, for that tags are not needed at all. So imho a working resource might be the first merge and the tag support for said resource might be a second seperate merge.

This does not imply that I'm not trying to squeeze tag-support in the resource right from the get go but there might be some problems wich are not that easy to overcome.

[marcotesch]

This is now the first functioning version without Tags, so far.

I will now add some documentation, but the main code is ready for an official review (@bflad) at this point in time.

[xmj]

@marcotesch wondering if you could fix the merge conflicts

thanks!

[zerfahp]

Would it be possible to get this one going? Sorry, I can't tell if this is difficult or not. It would be extremely useful to have this capability. Thanks.

[DominicBreuker]

would also love to see it merged :)

[marcotesch]

At the moment, I unfortunately don't have the time to write the needed documentation, which leads to the problem that this might not be merged any time soon. But for now I resolved the existing merge conflict.

[bflad]

Hi @marcotesch 👋 Would it be okay if the maintainers or another community member finished up this functionality in followup commits?

[marcotesch]

Hi, Yes it would be absolutely fine and appreciated, I’m sorry that I can’t finish it up on my own at the moment.

[bflad]

@marcotesch no worries, you did great work and many people will be happy when the functionality is made available! We hope that you can continue contributing in the future. 😄

I will post a followup PR either later today or tomorrow that combines this with #8136

[bflad]

Followup PR which includes all the commits here is available at: #9290

Please follow that pull request for further updates and thank you again for all the hard work, @marcotesch!

[zerfahp]

Thanks for pushing on with this. Much appreciated. Looking forward to putting it to use soon.

[DominicBreuker]

thx a lot!

[bflad]

#9290 has been merged and will release with version 2.19.0 of the Terraform AWS Provider, likely later today. 👍

[ghost]

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!