merge changes #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update rate based rule limit for WAF
This reverts commit 8d24ade.
Change panic to error and return it
Final retries for ACM cert
Add aws.StringValue wrapper to prevent crash on missing environment name
Ignore lint complaints for valid fsx lustre fs tests
`r53` is the deprecated name of `route53`.
Add import for SSM association
…tion periods (#9942) * d/aws_s3_bucket_object: Add 'object_lock_legal_hold_status' attribute. * r/aws_s3_bucket_object: Add 'object_lock_legal_hold_status' attribute. * r/aws_s3_bucket_object: Add 'force_destroy' attribute. * r/aws_s3_bucket: Handle locked object for 'force_destroy'. * d/aws_s3_bucket_object: Add 'object_lock_mode' and 'object_lock_retain_until_date' attributes. r/aws_s3_bucket_object: Add 'object_lock_mode' and 'object_lock_retain_until_date' attributes. * Fix documentation typo. * r/aws_s3_bucket_object: Add S3 Object Lock example usage. * Only attempt to force destroy S3 bucket objects if the bucket has Object Lock enabled. * r/aws_s3_bucket_object: Update S3 Object Lock example usage with Object Lock enabled bucket. * Fix minor review comments.
Signed-off-by: Mike Juarez <mikejuarez@gmail.com>
Signed-off-by: Michael Juarez <mikejuarez@gmail.com>
Signed-off-by: Michael Juarez <mikejuarez@gmail.com>
Add python_version for glue jobs
Add Amazon QLDB service client
…corp/terraform-plugin-sdk Reference: https://www.terraform.io/docs/extend/plugin-sdk.html Updated via: ```console $ tf-sdk-migrator migrate $ go1.12 get github.com/terraform-providers/terraform-provider-tls@v2.1.1+incompatible $ go get github.com/bflad/tfproviderlint@v0.5.0 $ go mod tidy $ go mod vendor ``` Output from acceptance testing (provided as a smoke test): ``` --- PASS: TestAccAWSProvider_Region_AwsCommercial (2.87s) --- PASS: TestAccAWSProvider_Region_AwsChina (2.88s) --- PASS: TestAccAWSProvider_Region_AwsGovCloudUs (2.90s) --- PASS: TestAccAWSProvider_Endpoints_Deprecated (3.12s) --- PASS: TestAccAWSProvider_Endpoints (3.15s) ```
…aform to github.com/hashicorp/terraform-plugin-sdk Reference: https://www.terraform.io/docs/extend/plugin-sdk.html
…-sdk deps: Migrate from github.com/hashicorp/terraform to github.com/hashicorp/terraform-plugin-sdk
…in-sdk migration Reference: #10367
…-plugin-sdk-migration provider: Add hashibot deprecated_import_commenter for terraform-plugin-sdk migration
While testing a few IAM roles a number of lingering IAM roles with the prefix test-role were found in our testing account. This change updates the list of known test prefixes to help clean up after acceptance tests. ``` 2019/10/03 13:46:15 [DEBUG] Deleting IAM Role: test-role-czb6pl0e34 2019/10/03 13:46:16 [DEBUG] Deleting IAM Role: test-role-d0028y7qm1 2019/10/03 13:46:17 [DEBUG] Deleting IAM Role: test-role-dfynstp2p8 2019/10/03 13:46:18 [DEBUG] Deleting IAM Role: test-role-dwvcp903bo 2019/10/03 13:46:19 [DEBUG] Deleting IAM Role: test-role-ec2-8188536180317514030 2019/10/03 13:46:19 [DEBUG] Deleting IAM Role: test-role-ec2-8467891203856496364 2019/10/03 13:46:20 [DEBUG] Deleting IAM Role: test-role-emlb90qlxy 2019/10/03 13:46:21 [DEBUG] Deleting IAM Role: test-role-eo1x8sj7ij 2019/10/03 13:46:22 [DEBUG] Deleting IAM Role: test-role-eossli2ess 2019/10/03 13:46:23 [DEBUG] Deleting IAM Role: test-role-epbkr7nb7d 2019/10/03 13:46:24 [DEBUG] Deleting IAM Role: test-role-fvouo0zuoy 2019/10/03 13:46:25 [DEBUG] Deleting IAM Role: test-role-fyjmcb703v 2019/10/03 13:46:26 [DEBUG] Deleting IAM Role: test-role-g1e6s24tr8 2019/10/03 13:46:27 [DEBUG] Deleting IAM Role: test-role-g42ffnpvwz 2019/10/03 13:46:28 [DEBUG] Deleting IAM Role: test-role-g4qj9febuf 2019/10/03 13:46:29 [DEBUG] Deleting IAM Role: test-role-gqfgutmca1 2019/10/03 13:46:29 [DEBUG] Deleting IAM Role: test-role-h2chl68vwk 2019/10/03 13:46:30 [DEBUG] Deleting IAM Role: test-role-h2kydpe683 2019/10/03 13:46:31 [DEBUG] Deleting IAM Role: test-role-hfqzllm960 2019/10/03 13:46:32 [DEBUG] Deleting IAM Role: test-role-ho2eipx9o6 2019/10/03 13:46:33 [DEBUG] Deleting IAM Role: test-role-htnsf4k67a 2019/10/03 13:46:34 [DEBUG] Deleting IAM Role: test-role-i9ypnhdhx0 2019/10/03 13:46:35 [DEBUG] Deleting IAM Role: test-role-ibazcx71wh 2019/10/03 13:46:36 [DEBUG] Deleting IAM Role: test-role-iept7yhxf3 ```
…tion-wording provider: Update hashibot Terraform Plugin SDK migration comment wording
…e_destroy argument and object keys with empty "directory" prefixes Reference: #9942 While aws_s3_bucket_object resources cannot create object keys with extra slashes (empty "directory" prefixes, e.g. `//extraleadingslash.txt`), other AWS services and applications using the S3 Bucket can. This problem seems related to the refactoring in #9942, which switched from using the `DeleteObjects` API call (`Key` parameters in request body) to the `DeleteObject` (`Key` parameter in request URI). We may want to reconsider changing `deleteAllS3ObjectVersions()` back to using `DeleteObjects` for efficiency, catching the returned `Errors` from the response to handle any `PutObjectLegalHold` changes necessary, but I think that is out of scope of this fix. The previous failing behavior from the new accceptance test was that it would always just run until the testing timeout (never actually able to delete the S3 Bucket). Output from acceptance testing (`TestAccAWSCloudTrail/Trail/basic` originally displayed this issue before the new acceptance testing): ``` --- PASS: TestAccAWSCloudTrail/Trail/basic (61.14s) --- PASS: TestAccAWSS3Bucket_acceleration (60.47s) --- PASS: TestAccAWSS3Bucket_basic (30.85s) --- PASS: TestAccAWSS3Bucket_Bucket_EmptyString (31.39s) --- PASS: TestAccAWSS3Bucket_Cors_Delete (28.55s) --- PASS: TestAccAWSS3Bucket_Cors_EmptyOrigin (32.60s) --- PASS: TestAccAWSS3Bucket_Cors_Update (51.53s) --- PASS: TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled (49.39s) --- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed (31.37s) --- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical (57.21s) --- PASS: TestAccAWSS3Bucket_forceDestroy (25.84s) --- PASS: TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes (26.06s) --- PASS: TestAccAWSS3Bucket_forceDestroyWithObjectLockEnabled (30.31s) --- PASS: TestAccAWSS3Bucket_generatedName (28.75s) --- PASS: TestAccAWSS3Bucket_LifecycleBasic (70.74s) --- PASS: TestAccAWSS3Bucket_LifecycleExpireMarkerOnly (52.23s) --- PASS: TestAccAWSS3Bucket_Logging (45.53s) --- PASS: TestAccAWSS3Bucket_namePrefix (36.83s) --- PASS: TestAccAWSS3Bucket_objectLock (50.36s) --- PASS: TestAccAWSS3Bucket_Policy (68.41s) --- PASS: TestAccAWSS3Bucket_region (29.66s) --- PASS: TestAccAWSS3Bucket_Replication (209.69s) --- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlTranslation (136.24s) --- PASS: TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError (33.68s) --- PASS: TestAccAWSS3Bucket_ReplicationSchemaV2 (205.78s) --- PASS: TestAccAWSS3Bucket_ReplicationWithoutPrefix (63.72s) --- PASS: TestAccAWSS3Bucket_ReplicationWithoutStorageClass (66.43s) --- PASS: TestAccAWSS3Bucket_RequestPayer (52.27s) --- PASS: TestAccAWSS3Bucket_shouldFailNotFound (13.76s) --- PASS: TestAccAWSS3Bucket_tagsWithNoSystemTags (91.66s) --- PASS: TestAccAWSS3Bucket_tagsWithSystemTags (126.69s) --- PASS: TestAccAWSS3Bucket_UpdateAcl (49.76s) --- PASS: TestAccAWSS3Bucket_Versioning (71.84s) --- PASS: TestAccAWSS3Bucket_Website_Simple (71.35s) --- PASS: TestAccAWSS3Bucket_WebsiteRedirect (71.47s) --- PASS: TestAccAWSS3Bucket_WebsiteRoutingRules (51.40s) ```
…ch_domain-dedup-resource-names test/datasource/aws_elasticsearch_domain: Remove service role resource creation
…rce_destroy-infinite resource/aws_s3_bucket: Prevent infinite deletion recursion with force_destroy argument and object keys with empty "directory" prefixes
resource/aws_vpc: Refactor to use keyvaluetags and call Read after Create
…remove-tls-provider tests/resource/aws_lb_listener: Use internal implementation for TLS key/certificate
…domain_name-remove-tls-provider tests/service/apigateway: Use internal implementation for TLS key/certificate
DrFaust92
pushed a commit
that referenced
this pull request
Mar 6, 2020
DrFaust92
pushed a commit
that referenced
this pull request
Aug 26, 2020
* Implementation of resource new resource type for GuardDuty S3 Export (hashicorp#10920) * Added tests and documentation * Fixed test namings * Fixed linter issues and removed explicit import test case * Fixed HCL formatting in documentation * Fixed some namings and sidebar link * Update/refactor publishing destination (#1) * Merged latest master changes and resolved conflicts * Merged from Upstream master and squashed commits * Delete defaults.go * Removed changes from vendor subdirectory and synched with master. * Refactor GuardDuty to waiter pattern * Remove unused constant * Small refactor based on PR review * Add disappears test and refactor based on PR review * Refactor based on PR review * Refactor according to PR review * Additional fix wrt tf 0.12 Co-authored-by: Sebastian Häpe <Sebastian.Haepe@nordcloud.com> Co-authored-by: shaepe <44882151+shaepe@users.noreply.github.com>
DrFaust92
pushed a commit
that referenced
this pull request
Jan 14, 2021
DrFaust92
pushed a commit
that referenced
this pull request
Apr 9, 2021
|
I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Community Note
Fixes #0000
Release note for CHANGELOG:
Output from acceptance testing: