Merge upstream #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
…2 is conditional on opened action The payload is slightly different in v2, so actions/github@v1.0.0 fails with the action flag and does not return a neutral status. Instead, we will pre-filter the step via if. References: - https://help.github.com/en/articles/workflow-syntax-for-github-actions#jobsjob_idif - https://github.com/actions/github/blob/4f0213ed102c4b518a7ce8bc4e6268bdd710770e/entrypoint.js#L73-L85
Correct `name` -> `bucket` in flog_log docs
…m/Jamian/terraform-provider-aws into Jamian-detecting-drift-on-tg-attachments
…update test function names for codebase conventions Output from acceptance testing: ``` --- PASS: TestAccAWSLBTargetGroupAttachment_lambda (31.23s) --- PASS: TestAccAWSLBTargetGroupAttachment_disappears (91.09s) --- PASS: TestAccAWSLBTargetGroupAttachment_ipAddress (102.80s) --- PASS: TestAccAWSLBTargetGroupAttachment_basic (103.02s) --- PASS: TestAccAWSLBTargetGroupAttachment_withoutPort (123.06s) --- PASS: TestAccAWSLBTargetGroupAttachment_BackwardsCompatibility (123.37s) ```
…//github.com/ysmazda/terraform-provider-aws into ysmazda-support-performance-insights-in-aurora-mysql
…ests for performance_insights_enabled on Aurora MySQL 1/2 and Postgresql Reference: #9227 Reference: #9635 Output from acceptance testing: ``` --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (629.12s) --- PASS: TestAccAWSRDSClusterInstance_namePrefix (677.80s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (679.39s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (680.27s) --- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (699.01s) --- PASS: TestAccAWSRDSClusterInstance_generatedName (712.49s) --- PASS: TestAccAWSRDSClusterInstance_az (722.51s) --- PASS: TestAccAWSRDSClusterInstance_disappears (763.18s) --- PASS: TestAccAWSRDSClusterInstance_withInstanceEnhancedMonitor (873.08s) --- PASS: TestAccAWSRDSClusterInstance_kmsKey (1062.91s) --- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (1247.95s) --- PASS: TestAccAWSRDSClusterInstance_basic (1423.02s) ```
…tering provider: Ensure needs-triage issue labeling step in GitHub Actions v2 is conditional on opened action
…n update if configured Reference: #8792 Reference: #9399 Reference: #9406 Previously before code update: ``` --- PASS: TestAccAWSRDSDBInstance_PerformanceInsightsRetentionPeriod (667.32s) --- PASS: TestAccAWSRDSDBInstance_PerformanceInsightsEnabled_EnabledToDisabled (733.03s) --- PASS: TestAccAWSRDSDBInstance_PerformanceInsightsKmsKeyId (862.56s) --- FAIL: TestAccAWSRDSDBInstance_PerformanceInsightsEnabled_DisabledToEnabled (5686.66s) testing.go:568: Step 2 error: errors during apply: Error: Error modifying DB Instance tf-acc-test-5551941564373291595: InternalFailure: status code: 500, request id: 9ad8b0ff-c5a2-43d0-a531-60aa047b8570 ``` Output from acceptance testing: ``` --- PASS: TestAccAWSRDSDBInstance_PerformanceInsightsEnabled_EnabledToDisabled (680.88s) --- PASS: TestAccAWSRDSDBInstance_PerformanceInsightsEnabled_DisabledToEnabled (680.95s) --- PASS: TestAccAWSRDSDBInstance_PerformanceInsightsRetentionPeriod (685.18s) --- PASS: TestAccAWSRDSDBInstance_PerformanceInsightsKmsKeyId (851.11s) ```
…y_id updates include performance_insights_enabled Reference: #3015 This update ensures the correct RDS API error is shown when attempting to modify the Performance Insights KMS Key ID (we use `ExpectError` in the testing so this passes): ``` --- FAIL: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_DefaultKeyToCustomKey (691.76s) testing.go:568: Step 2 error: errors during apply: Error: Error modifying DB Instance tf-acc-test-2133090011528324987: InvalidParameterCombination: You cannot change your Performance Insights KMS key ``` Previously before code update: ``` --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (587.54s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (594.85s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_CustomKey (660.70s) --- FAIL: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_DefaultKeyToCustomKey (667.49s) testing.go:568: Step 2 error: errors during apply: Error: Error modifying DB Instance tf-acc-test-4757962708939555369: InvalidParameterCombination: Can not set PerformanceInsightsKMSKeyId without EnablePerformanceInsights status code: 400, request id: c64b9f56-1b56-420c-9575-c5cfed87270b on /var/folders/v0/_d108fkx1pbbg4_sh864_7740000gn/T/tf-test833219777/main.tf line 15: (source code not available) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (699.46s) ``` Output from acceptance testing: ``` --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (630.56s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (649.52s) --- PASS: TestAccAWSRDSClusterInstance_generatedName (651.77s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (652.94s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (670.18s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_CustomKey (671.61s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (672.19s) --- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (683.28s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (690.78s) --- PASS: TestAccAWSRDSClusterInstance_disappears (730.05s) --- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (732.08s) --- PASS: TestAccAWSRDSClusterInstance_az (747.28s) --- PASS: TestAccAWSRDSClusterInstance_namePrefix (764.03s) --- PASS: TestAccAWSRDSClusterInstance_kmsKey (792.98s) --- PASS: TestAccAWSRDSClusterInstance_withInstanceEnhancedMonitor (822.65s) --- PASS: TestAccAWSRDSClusterInstance_basic (1516.75s) ```
…tten to state and retry ModifyDBInstance on IAM eventual consistency error References: - #315 - #2188 - #5559 Previously before code updates: ``` --- FAIL: TestAccAWSDBInstance_MonitoringRoleArn_RemovedToEnabled (430.95s) testing.go:568: Step 2 error: errors during apply: Error: Error modifying DB Instance tf-acc-test-1165998526456666486: InvalidParameterValue: IAM role ARN value is invalid or does not include the required permissions for: ENHANCED_MONITORING status code: 400, request id: 524f599d-3870-48b3-843e-28885ae3f75c on /var/folders/v0/_d108fkx1pbbg4_sh864_7740000gn/T/tf-test908490254/main.tf line 29: (source code not available) --- PASS: TestAccAWSDBInstance_MonitoringRoleInterval (565.47s) --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_EnabledToDisabled (593.87s) --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_EnabledToRemoved (626.12s) ``` Output from acceptance testing: ``` --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_EnabledToDisabled (587.93s) --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_RemovedToEnabled (614.89s) --- PASS: TestAccAWSDBInstance_MonitoringRoleArn_EnabledToRemoved (656.13s) --- PASS: TestAccAWSDBInstance_MonitoringRoleInterval (702.57s) ```
…vers disabling and re-enabling Output from acceptance testing: ``` --- PASS: TestAccAWSDBInstance_MonitoringInterval (978.85s) ```
…lways written to state Reference: #315 Output from acceptance testing: ``` --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (588.69s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (640.98s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (661.39s) --- PASS: TestAccAWSRDSClusterInstance_namePrefix (674.32s) --- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (703.51s) --- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (714.73s) --- PASS: TestAccAWSRDSClusterInstance_disappears (735.39s) --- PASS: TestAccAWSRDSClusterInstance_generatedName (774.99s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToRemoved (834.26s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_RemovedToEnabled (876.44s) --- PASS: TestAccAWSRDSClusterInstance_az (877.93s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToDisabled (912.63s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringInterval (1037.61s) --- PASS: TestAccAWSRDSClusterInstance_kmsKey (1205.30s) --- PASS: TestAccAWSRDSClusterInstance_basic (1301.24s) ```
…/terraform-provider-aws into slapula-resource-fsx-file-system
Rfd retry eip
Final retry after timeout creating EKS cluster
Final retries for elastic beanstalk apps
…stem Reference: #7035 Reference: #7074 Builds on #7074 with the following changes: - Split into two separate resources (`aws_fsx_lustre_file_system` and `aws_fsx_windows_file_system`) to simplify practitioner configuration (e.g. lose the required configuration blocks), ease maintenance for resource logic and single file system arguments (e.g. `kms_key_id` only for Windows), and enhance validations (e.g. `storage_capacity` differences between file systems) - Add covering acceptance testing with updates/force new for all arguments - Better alignment with API naming for some arguments (e.g. changing `capacity` into `storage_capacity` to remove ambiguity with `throughput_capacity`) - Implement [resource Customizable Timeouts](https://www.terraform.io/docs/extend/resources/retries-and-customizable-timeouts.html) - Implement `skip_final_backup` argument for Windows - Implement `network_interface_ids`, `owner_id`, and `vpc_id` attributes - Augment resource documentation with additional notes found in [API reference](https://docs.aws.amazon.com/fsx/latest/APIReference/) and clarify `security_group_ids` import behavior Output from acceptance testing: ``` --- PASS: TestAccAWSFsxLustreFileSystem_Tags (458.62s) --- PASS: TestAccAWSFsxLustreFileSystem_basic (526.79s) --- PASS: TestAccAWSFsxLustreFileSystem_disappears (564.58s) --- PASS: TestAccAWSFsxLustreFileSystem_WeeklyMaintenanceStartTime (697.83s) --- PASS: TestAccAWSFsxLustreFileSystem_StorageCapacity (940.13s) --- PASS: TestAccAWSFsxLustreFileSystem_SecurityGroupIds (1074.08s) --- PASS: TestAccAWSFsxLustreFileSystem_ImportedFileChunkSize (1276.18s) --- PASS: TestAccAWSFsxLustreFileSystem_ImportPath (1322.13s) --- PASS: TestAccAWSFsxLustreFileSystem_ExportPath (1338.75s) --- PASS: TestAccAWSFsxWindowsFileSystem_Tags (2256.64s) --- PASS: TestAccAWSFsxWindowsFileSystem_WeeklyMaintenanceStartTime (2346.44s) --- PASS: TestAccAWSFsxWindowsFileSystem_basic (2404.35s) --- PASS: TestAccAWSFsxWindowsFileSystem_disappears (2412.10s) --- PASS: TestAccAWSFsxWindowsFileSystem_AutomaticBackupRetentionDays (2514.61s) --- PASS: TestAccAWSFsxWindowsFileSystem_DailyAutomaticBackupStartTime (2849.43s) --- PASS: TestAccAWSFsxWindowsFileSystem_SelfManagedActiveDirectory (2850.64s) --- PASS: TestAccAWSFsxWindowsFileSystem_ThroughputCapacity (3292.44s) --- PASS: TestAccAWSFsxWindowsFileSystem_SecurityGroupIds (3609.37s) --- PASS: TestAccAWSFsxWindowsFileSystem_KmsKeyId (3977.10s) --- PASS: TestAccAWSFsxWindowsFileSystem_StorageCapacity (4026.67s) --- PASS: TestAccAWSFsxWindowsFileSystem_CopyTagsToBackups (4389.57s) ```
To prevent sweeper errors such as: ``` 2019/09/04 02:12:15 [ERR] error running (aws_vpc): Error deleting Subnet (subnet-064c5a7cad5a28b9e): DependencyViolation: The subnet 'subnet-064c5a7cad5a28b9e' has dependencies and cannot be deleted. ``` Output from sweeper in AWS Commercial: ```console $ go test ./aws -v -sweep=us-east-1,us-west-2 -sweep-run=aws_cloudhsm_v2_cluster -timeout 10h 2019/09/04 10:27:24 [DEBUG] Running Sweepers for region (us-east-1): ... 2019/09/04 10:27:25 [INFO] Deleting CloudHSMv2 Cluster (cluster-wporekks46b) HSM: hsm-y4tvi5ukedh ... 2019/09/04 10:29:06 [INFO] Deleting CloudHSMv2 Cluster: cluster-wporekks46b ... 2019/09/04 10:30:57 Sweeper Tests ran: - aws_cloudhsm_v2_cluster 2019/09/04 10:30:57 [DEBUG] Running Sweepers for region (us-west-2): ... 2019/09/04 10:30:59 [INFO] Deleting CloudHSMv2 Cluster: cluster-w56d2uzszjf ... 2019/09/04 10:31:30 [INFO] Deleting CloudHSMv2 Cluster: cluster-zrvllautsay ... 2019/09/04 10:32:01 [INFO] Deleting CloudHSMv2 Cluster: cluster-chxrr77wb2v ... 2019/09/04 10:32:32 Sweeper Tests ran: - aws_cloudhsm_v2_cluster ``` Output from sweeper in AWS GovCloud (US): ```console $ go test ./aws -v -sweep=us-gov-west-1 -sweep-run=aws_cloudhsm_v2_cluster -timeout 10h 2019/09/04 10:28:52 [DEBUG] Running Sweepers for region (us-gov-west-1): ... 2019/09/04 10:28:54 Sweeper Tests ran: - aws_cloudhsm_v2_cluster ``` Output from acceptance testing: ``` --- PASS: TestAccAWSCloudHsm2Cluster_basic (285.06s) --- PASS: TestAccAWSCloudHsm2Hsm_basic (898.88s) ```
Added IoT Analytics Service
Import testing for vpn gateway
…luster-sweeper service/cloudhsmv2: Implement sweeper
Output from acceptance testing: ``` --- PASS: TestAccAWSEcsCluster_disappears (9.90s) --- PASS: TestAccAWSEcsCluster_basic (13.35s) --- PASS: TestAccAWSEcsCluster_containerInsights (25.56s) --- PASS: TestAccAWSEcsCluster_Tags (27.62s) --- PASS: TestAccAWSEcsDataSource_ecsClusterContainerInsights (14.16s) --- PASS: TestAccAWSEcsDataSource_ecsCluster (14.25s) ```
Updated via: ``` $ go get github.com/aws/aws-sdk-go@v1.23.15 $ go mod tidy $ go mod vendor ```
deps: Update github.com/aws/aws-sdk-go@v1.23.15
Import test refactor for subnets
Import acceptance test refactor for SSM resources
Acceptance test import refactor for SQS queue policy
Acceptance test import refactor for simpledb domain
Acceptance test import refactor for SFN activity
Acceptance test import refactor for SES template
Acceptance test import refactor for service resources
Update CentOS 7's Blueprint ID to latest
Co-Authored-By: Ryn Daniels <ryn@hashicorp.com>
Add created_at attribute to lightsail instance documentation
…ig-pkg Remove usage of terraform.NewResourceConfig
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.