merge #12
Merged
merge #12
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
…gle principal identifer with multiple principal identifiers Reference: #10777 Output from acceptance testing before fix: ``` === CONT TestAccAWSDataSourceIAMPolicyDocument_Statement_Principal_Identifiers_StringAndSlice panic: interface conversion: interface {} is string, not []string [recovered] panic: interface conversion: interface {} is string, not []string goroutine 254 [running]: encoding/json.(*encodeState).marshal.func1(0xc00158f5a8) /usr/local/Cellar/go/1.13.4/libexec/src/encoding/json/encode.go:305 +0x9a panic(0x5a68a40, 0xc000d48210) /usr/local/Cellar/go/1.13.4/libexec/src/runtime/panic.go:679 +0x1b2 github.com/terraform-providers/terraform-provider-aws/aws.IAMPolicyStatementPrincipalSet.MarshalJSON(0xc000a17580, 0x2, 0x2, 0x100c733, 0x5a73f60, 0x591b720, 0x7178801, 0xbbd7098) /Users/bflad/src/github.com/terraform-providers/terraform-provider-aws/aws/iam_policy_model.go:101 +0x866 ``` Output from acceptance testing after fix: ``` --- PASS: TestAccAWSDataSourceIAMPolicyDocument_Statement_Principal_Identifiers_StringAndSlice (10.23s) --- PASS: TestAccAWSDataSourceIAMPolicyDocument_noStatementMerge (10.26s) --- PASS: TestAccAWSDataSourceIAMPolicyDocument_basic (10.29s) --- PASS: TestAccAWSDataSourceIAMPolicyDocument_noStatementOverride (10.30s) --- PASS: TestAccAWSDataSourceIAMPolicyDocument_sourceConflicting (10.40s) --- PASS: TestAccAWSDataSourceIAMPolicyDocument_override (10.53s) --- PASS: TestAccAWSDataSourceIAMPolicyDocument_duplicateSid (11.02s) --- PASS: TestAccAWSDataSourceIAMPolicyDocument_Version_20081017 (14.87s) --- PASS: TestAccAWSDataSourceIAMPolicyDocument_source (15.20s) ```
#10827) Output from acceptance testing: ``` --- PASS: TestAccAWSEIP_disappears (7.75s) --- PASS: TestAccAWSEIP_basic (9.43s) --- PASS: TestAccAWSEIP_PublicIpv4Pool_default (9.85s) --- PASS: TestAccAWSEIP_tags (14.05s) --- PASS: TestAccAWSEIP_twoEIPsOneNetworkInterface (27.66s) --- PASS: TestAccAWSEIP_networkInterface (28.02s) --- PASS: TestAccAWSEIP_associated_user_private_ip (121.31s) --- PASS: TestAccAWSEIP_instance (156.16s) ```
…#10828) Output from acceptance testing: ``` --- PASS: TestAccAWSDataPipelinePipeline_disappears (7.05s) --- PASS: TestAccAWSDataPipelinePipeline_basic (13.97s) --- PASS: TestAccAWSDataPipelinePipeline_description (14.48s) --- PASS: TestAccAWSDataPipelinePipeline_tags (18.47s) ```
Output from acceptance testing: ``` --- PASS: TestAccAWSSagemakerNotebookInstanceLifecycleConfiguration_Basic (13.09s) --- PASS: TestAccAWSSagemakerNotebookInstanceLifecycleConfiguration_Update (17.58s) --- PASS: TestAccAWSSagemakerModel_vpcConfig (28.38s) --- PASS: TestAccAWSSagemakerModel_primaryContainerEnvironment (32.37s) --- PASS: TestAccAWSSagemakerModel_tags (38.38s) --- PASS: TestAccAWSSagemakerModel_primaryContainerModelDataUrl (57.25s) --- PASS: TestAccAWSSagemakerModel_networkIsolation (58.30s) --- PASS: TestAccAWSSagemakerEndpointConfiguration_KmsKeyId (66.96s) --- PASS: TestAccAWSSagemakerEndpointConfiguration_ProductionVariants_InitialVariantWeight (69.81s) --- PASS: TestAccAWSSagemakerEndpointConfiguration_Basic (72.72s) --- PASS: TestAccAWSSagemakerModel_containers (80.18s) --- PASS: TestAccAWSSagemakerEndpointConfiguration_ProductionVariants_AcceleratorType (83.74s) --- PASS: TestAccAWSSagemakerModel_primaryContainerHostname (84.47s) --- PASS: TestAccAWSSagemakerModel_basic (87.51s) --- PASS: TestAccAWSSagemakerNotebookInstance_LifecycleConfigName (281.64s) --- PASS: TestAccAWSSagemakerNotebookInstance_basic (298.15s) --- PASS: TestAccAWSSagemakerNotebookInstance_tags (304.80s) --- PASS: TestAccAWSSagemakerNotebookInstance_disappears (309.15s) --- PASS: TestAccAWSSagemakerNotebookInstance_update (556.12s) --- PASS: TestAccAWSSagemakerEndpoint_Tags (585.78s) --- PASS: TestAccAWSSagemakerEndpoint_basic (593.07s) --- PASS: TestAccAWSSagemakerEndpoint_EndpointConfigName (991.56s) ```
…rameter_group to use keyvaluetags package (#10841) Output from acceptance testing: ``` --- PASS: TestAccAWSRDSClusterInstance_az (752.61s) --- PASS: TestAccAWSRDSClusterInstance_namePrefix (776.40s) --- PASS: TestAccAWSRDSClusterInstance_disappears (786.45s) --- PASS: TestAccAWSDBClusterParameterGroup_basic (13.46s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (793.22s) --- PASS: TestAccAWSDBClusterParameterGroup_withApplyMethod (8.18s) --- PASS: TestAccAWSDBClusterParameterGroup_namePrefix (8.15s) --- PASS: TestAccAWSDBClusterParameterGroup_namePrefix_Parameter (8.30s) --- PASS: TestAccAWSDBClusterParameterGroup_generatedName (8.04s) --- PASS: TestAccAWSDBClusterParameterGroup_generatedName_Parameter (8.20s) --- PASS: TestAccAWSRDSClusterInstance_generatedName (806.96s) --- PASS: TestAccAWSDBClusterParameterGroup_disappears (6.27s) --- PASS: TestAccAWSDBClusterParameterGroup_only (7.89s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2 (823.07s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (833.29s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql (848.39s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (857.54s) --- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (869.82s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1 (886.31s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_RemovedToEnabled (888.60s) --- PASS: TestAccAWSRDSClusterInstance_kmsKey (891.33s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToDisabled (914.77s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (917.47s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (933.74s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToRemoved (1008.81s) --- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (1020.63s) --- PASS: TestAccAWSRDSClusterInstance_MonitoringInterval (1331.64s) --- PASS: TestAccAWSRDSClusterInstance_basic (1657.71s) --- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (1012.91s) ```
…_route53_resolver_rule to use keyvaluetags package (#10842) Output from acceptance testing: ``` --- PASS: TestAccAwsRoute53ResolverRule_basic (27.81s) --- PASS: TestAccAwsRoute53ResolverRule_tags (38.34s) --- PASS: TestAccAwsRoute53ResolverRule_updateName (43.05s) --- PASS: TestAccAwsRoute53ResolverEndpoint_basicInbound (73.45s) --- PASS: TestAccAwsRoute53ResolverRuleAssociation_basic (140.03s) --- PASS: TestAccAwsRoute53ResolverRule_forward (227.56s) --- PASS: TestAccAwsRoute53ResolverEndpoint_updateOutbound (331.23s) --- PASS: TestAccAwsRoute53ResolverRule_forwardEndpointRecreate (431.81s) ```
``` go mod vendor ```
…_document data-source/aws_iam_policy_document: support multiple princiapls in iam policy document without dropping some
…ocument-stringandslicepanic data-source/aws_iam_policy_document: Prevent panic when combining single principal identifier with multiple principal identifiers
#10864) * internal/keyvaluetags: Fix dlm service tagging for resource tags The service did not previously support resource tagging (slice based Tag types were used for other structures not relevant to the purpose of this package). Here we generate all functionality related to DLM resource tagging including listing and updating. Updated via: ``` make gen ``` * resource/aws_dlm_lifecycle_policy: Add tags argument and arn attribute Reference: https://github.com/terraform-providers/terraform-provider-aws/blob/master/.github/CONTRIBUTING.md#adding-resource-tagging-support Output from acceptance testing: ``` --- PASS: TestAccAWSDlmLifecyclePolicy_Basic (14.81s) --- PASS: TestAccAWSDlmLifecyclePolicy_Full (22.48s) --- PASS: TestAccAWSDlmLifecyclePolicy_Tags (32.00s) ```
…orm state on NoSuchResourceException error (#10735) Reference: https://aws.amazon.com/blogs/compute/preview-vcpu-based-instance-limits/ Recently, AWS EC2 removed certain instance service quotas: > Beginning October 24, 2019, all accounts will switch to vCPU-based instance limits, and the current count-based instance limits will no longer be supported. These may have been managed previously by Terraform configurations, however they now return the following error (as would any other quotas removed in the future): ``` Error: error getting Service Quotas Service Quota (ec2/L-F26B0BF2): NoSuchResourceException: status code: 400, request id: d37df234-c1eb-420e-abce-a73c6cde2999 ``` Given this error, it is not possible to remove the problematic resource without manually calling `terraform state rm`. The correct behavior in this case is for the Terraform resource to remove itself from the state and propose recreation, which would allow operators to successfully remove the missing quotas from their configurations. This particular change cannot be directly acceptance tested since the availability of quotas is managed by AWS, not a managable resource. Output from acceptance testing (requesting increase of VPC internet gateways and VPCs limits in a personal testing account): ``` export SERVICEQUOTAS_INCREASE_ON_CREATE_QUOTA_CODE=L-A4707A72 export SERVICEQUOTAS_INCREASE_ON_CREATE_SERVICE_CODE=vpc export SERVICEQUOTAS_INCREASE_ON_CREATE_VALUE=6 export SERVICEQUOTAS_INCREASE_ON_UPDATE_QUOTA_CODE=L-F678F1CE export SERVICEQUOTAS_INCREASE_ON_UPDATE_SERVICE_CODE=vpc export SERVICEQUOTAS_INCREASE_ON_UPDATE_VALUE=6 --- PASS: TestAccAwsServiceQuotasServiceQuota_Value_IncreaseOnCreate (13.62s) --- PASS: TestAccAwsServiceQuotasServiceQuota_basic (15.23s) --- PASS: TestAccAwsServiceQuotasServiceQuota_Value_IncreaseOnUpdate (23.09s) ```
…d_until timestamps (#10783) Fixes errors in the acceptance testing due to the hardcoded timestamp that now in the past: ``` --- FAIL: TestAccAWSAppautoScalingPolicy_spotFleetRequest (608.94s) testing.go:615: Step 0 error: errors during apply: Error: Error requesting spot fleet: Error creating Spot fleet request, retrying: InvalidSpotFleetRequestConfig: Parameter: SpotFleetRequestConfig.ValidUntil is invalid. ``` Output from acceptance testing: ``` --- PASS: TestAccAWSAppautoScalingPolicy_spotFleetRequest (65.36s) --- PASS: TestAccAWSAppautoScalingTarget_spotFleetRequest (69.39s) --- PASS: TestAccAWSAppautoscalingScheduledAction_SpotFleet (71.95s) --- PASS: TestAccAWSSpotFleetRequest_associatePublicIpAddress (216.48s) --- PASS: TestAccAWSSpotFleetRequest_basic (206.35s) --- PASS: TestAccAWSSpotFleetRequest_changePriceForcesNewRequest (533.57s) --- PASS: TestAccAWSSpotFleetRequest_diversifiedAllocation (345.03s) --- PASS: TestAccAWSSpotFleetRequest_fleetType (257.81s) --- PASS: TestAccAWSSpotFleetRequest_iamInstanceProfileArn (214.58s) --- PASS: TestAccAWSSpotFleetRequest_instanceInterruptionBehavior (270.14s) --- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_EbsBlockDevice_KmsKeyId (164.61s) --- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_RootBlockDevice_KmsKeyId (163.22s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList (343.26s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion (262.21s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList (270.21s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstancePools (342.22s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz (268.54s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet (271.32s) --- PASS: TestAccAWSSpotFleetRequest_overriddingSpotPrice (343.62s) --- PASS: TestAccAWSSpotFleetRequest_placementTenancyAndGroup (57.47s) --- PASS: TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy (462.71s) --- PASS: TestAccAWSSpotFleetRequest_updateTargetCapacity (739.95s) --- PASS: TestAccAWSSpotFleetRequest_withEBSDisk (207.57s) --- PASS: TestAccAWSSpotFleetRequest_WithELBs (267.87s) --- PASS: TestAccAWSSpotFleetRequest_withoutSpotPrice (249.80s) --- PASS: TestAccAWSSpotFleetRequest_withTags (248.02s) --- PASS: TestAccAWSSpotFleetRequest_WithTargetGroups (355.43s) --- PASS: TestAccAWSSpotFleetRequest_withWeightedCapacity (268.46s) ```
Reference: #7668 Output from acceptance testing: ``` --- PASS: TestAccAWSGlueCrawler_Role_ARN_NoPath (28.38s) === CONT TestAccAWSGlueCrawler_Description --- PASS: TestAccAWSGlueCrawler_DynamodbTarget (40.11s) --- PASS: TestAccAWSGlueCrawler_recreates (43.78s) --- PASS: TestAccAWSGlueCrawler_SchemaChangePolicy (50.51s) --- PASS: TestAccAWSGlueCrawler_Role_Name_Path (65.68s) --- PASS: TestAccAWSGlueCrawler_Schedule (66.49s) --- PASS: TestAccAWSGlueCrawler_JdbcTarget (71.86s) --- PASS: TestAccAWSGlueCrawler_S3Target_Multiple (79.39s) --- PASS: TestAccAWSGlueCrawler_Classifiers (80.65s) --- PASS: TestAccAWSGlueCrawler_CatalogTarget (82.52s) --- PASS: TestAccAWSGlueCrawler_TablePrefix (83.61s) --- PASS: TestAccAWSGlueCrawler_Description (57.27s) --- PASS: TestAccAWSGlueCrawler_Configuration (87.52s) --- PASS: TestAccAWSGlueCrawler_Role_ARN_Path (92.15s) --- PASS: TestAccAWSGlueCrawler_JdbcTarget_Multiple (95.38s) --- PASS: TestAccAWSGlueCrawler_S3Target (100.83s) --- PASS: TestAccAWSGlueCrawler_JdbcTarget_Exclusions (101.16s) --- PASS: TestAccAWSGlueCrawler_CatalogTarget_Multiple (103.88s) --- PASS: TestAccAWSGlueCrawler_S3Target_Exclusions (103.90s) --- PASS: TestAccAWSGlueCrawler_Tags (120.73s) --- PASS: TestAccAWSGlueCrawler_SecurityConfiguration (124.13s) ```
|
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
Relates OR Closes #0000
Release note for CHANGELOG:
Output from acceptance testing: