Merging master into feature branch #2
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
Output from acceptance testing: ``` --- PASS: TestAccAWSOutpostsOutpostDataSource_Id (25.86s) --- PASS: TestAccAWSOutpostsOutpostDataSource_Name (32.28s) --- PASS: TestAccAWSOutpostsOutpostsDataSource_basic (21.47s) ```
…authorization_token New data source aws_ecr_authorization_token
New resource r/aws_wafv2_web_acl_association
Output from acceptance testing: ``` --- PASS: TestAccAWSOutpostsSiteDataSource_Id (24.36s) --- PASS: TestAccAWSOutpostsSiteDataSource_Name (27.23s) --- PASS: TestAccAWSOutpostsSitesDataSource_basic (19.61s) ```
Reference: https://github.com/terraform-providers/terraform-provider-aws/pull/13822/files#diff-683cc9195188c9a328fd277aa3f8bc50R3490 Reference: https://www.terraform.io/docs/providers/aws/d/ec2_instance_type_offering.html Reference: https://www.terraform.io/docs/providers/aws/d/ec2_instance_type_offerings.html Outposts can have varying instance types. Provide a lookup mechanism, similar to the `aws_ec2_instance_type_offering` data source. Output from acceptance testing: ``` --- PASS: TestAccAWSOutpostsOutpostInstanceTypesDataSource_basic (28.32s) --- PASS: TestAccAWSOutpostsOutpostInstanceTypeDataSource_PreferredInstanceTypes (30.90s) --- PASS: TestAccAWSOutpostsOutpostInstanceTypeDataSource_InstanceType (31.32s) ```
…AWSOutpostsOutposts and aws_outposts_outposts data source (#13822) Output from acceptance testing: ``` --- PASS: TestAccAWSEBSVolume_outpost (38.10s) --- PASS: TestAccAWSEc2LocalGatewayRoute_basic (23.40s) --- PASS: TestAccAWSEc2LocalGatewayRoute_disappears (22.71s) --- PASS: TestAccAwsEc2LocalGatewayRouteTableVpcAssociation_basic (36.22s) --- PASS: TestAccAwsEc2LocalGatewayRouteTableVpcAssociation_disappears (35.74s) --- PASS: TestAccAwsEc2LocalGatewayRouteTableVpcAssociation_Tags (77.06s) --- PASS: TestAccAWSEIP_CustomerOwnedIpv4Pool (20.78s) --- PASS: TestAccAWSInstance_outpost (367.21s) --- PASS: TestAccAWSSubnet_outpost (38.59s) --- PASS: TestAccDataSourceAwsEc2CoipPool_Filter (18.60s) --- PASS: TestAccDataSourceAwsEc2CoipPool_Id (18.53s) --- PASS: TestAccDataSourceAwsEc2CoipPools_basic (15.86s) --- PASS: TestAccDataSourceAwsEc2CoipPools_Filter (18.80s) --- PASS: TestAccDataSourceAwsEc2LocalGateway_basic (19.29s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTable_basic (19.46s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTable_Filter (21.37s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTable_LocalGatewayId (19.45s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTable_OutpostArn (22.41s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTables_basic (16.63s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayRouteTables_Filter (19.03s) --- PASS: TestAccDataSourceAwsEc2LocalGateways_basic (16.59s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayVirtualInterface_Filter (20.94s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayVirtualInterface_Id (22.55s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayVirtualInterface_Tags (25.83s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayVirtualInterfaceGroup_Filter (18.67s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayVirtualInterfaceGroup_LocalGatewayId (17.64s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayVirtualInterfaceGroup_Tags (21.97s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayVirtualInterfaceGroups_basic (17.53s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayVirtualInterfaceGroups_Filter (18.73s) --- PASS: TestAccDataSourceAwsEc2LocalGatewayVirtualInterfaceGroups_Tags (22.82s) --- PASS: TestAccDataSourceAWSEIP_CustomerOwnedIpv4Pool (21.93s) ```
…tor-wait-period-wording Expand contributing response timing guidelines and fix a couple links.
add support for Lambda file systems
Expand data.aws_workspaces_bundle With Owner/Name Filtering
Output from acceptance testing:
```
--- PASS: TestAccAwsSecretsManagerSecret_policy (16.61s)
--- PASS: TestAccAwsSecretsManagerSecret_withNamePrefix (18.88s)
--- PASS: TestAccAwsSecretsManagerSecret_Basic (19.04s)
--- PASS: TestAccAwsSecretsManagerSecret_Description (29.87s)
--- PASS: TestAccAwsSecretsManagerSecret_KmsKeyID (38.81s)
--- PASS: TestAccAwsSecretsManagerSecret_RecoveryWindowInDays_Recreate (45.96s)
TestAccAwsSecretsManagerSecret_RotationLambdaARN: testing.go:684: Step 2 error: Check failed: Check 2/3 error: aws_secretsmanager_secret.test: Attribute 'rotation_enabled' expected "false", got "true"
--- PASS: TestAccAwsSecretsManagerSecret_Tags (52.22s)
--- FAIL: TestAccAwsSecretsManagerSecret_RotationLambdaARN (56.77s)
TestAccAwsSecretsManagerSecret_RotationRules: testing.go:684: Step 2 error: Check failed: Check 2/3 error: aws_secretsmanager_secret.test: Attribute 'rotation_enabled' expected "false", got "true"
--- FAIL: TestAccAwsSecretsManagerSecret_RotationRules (64.77s)
--- PASS: TestAccAwsSecretsManagerSecretRotation (60.53s)
--- PASS: TestAccDataSourceAwsSecretsManagerSecretRotation_Basic (49.62s)
--- PASS: TestAccDataSourceAwsSecretsManagerSecret_Basic (8.24s)
--- PASS: TestAccDataSourceAwsSecretsManagerSecret_ARN (20.25s)
--- PASS: TestAccDataSourceAwsSecretsManagerSecret_Policy (20.68s)
--- PASS: TestAccDataSourceAwsSecretsManagerSecret_Name (21.14s)
```
…ation changes Reference: #9487
Output from acceptance testing: ``` --- PASS: TestAccAwsSecretsManagerSecret_RotationLambdaARN (65.39s) --- PASS: TestAccAwsSecretsManagerSecret_RotationRules (70.37s) --- PASS: TestAccAwsSecretsManagerSecretRotation (52.74s) ```
…b.com/jbergknoff-rival/terraform-provider-aws into jbergknoff-rival-jbergknoff/route53-delete-before-create
…bility_zones usage Output from acceptance testing: ``` --- PASS: TestAccAWSRoute53Record_Alias_Elb (180.35s) --- PASS: TestAccAWSRoute53Record_Alias_S3 (171.16s) --- PASS: TestAccAWSRoute53Record_Alias_Uppercase (215.76s) --- PASS: TestAccAWSRoute53Record_Alias_VpcEndpoint (523.96s) --- PASS: TestAccAWSRoute53Record_AliasChange (260.40s) --- PASS: TestAccAWSRoute53Record_allowOverwrite (226.43s) --- PASS: TestAccAWSRoute53Record_basic (144.66s) --- PASS: TestAccAWSRoute53Record_basic_fqdn (146.16s) --- PASS: TestAccAWSRoute53Record_caaSupport (150.70s) --- PASS: TestAccAWSRoute53Record_disappears (130.35s) --- PASS: TestAccAWSRoute53Record_disappears_MultipleRecords (183.50s) --- PASS: TestAccAWSRoute53Record_empty (201.91s) --- PASS: TestAccAWSRoute53Record_failover (185.00s) --- PASS: TestAccAWSRoute53Record_generatesSuffix (173.50s) --- PASS: TestAccAWSRoute53Record_geolocation_basic (255.41s) --- PASS: TestAccAWSRoute53Record_latency_basic (146.36s) --- PASS: TestAccAWSRoute53Record_longTXTrecord (158.31s) --- PASS: TestAccAWSRoute53Record_multivalue_answer_basic (247.80s) --- PASS: TestAccAWSRoute53Record_NameChange (306.27s) --- PASS: TestAccAWSRoute53Record_SetIdentifierChange (219.03s) --- PASS: TestAccAWSRoute53Record_spfSupport (169.50s) --- PASS: TestAccAWSRoute53Record_txtSupport (137.39s) --- PASS: TestAccAWSRoute53Record_TypeChange (200.09s) --- PASS: TestAccAWSRoute53Record_underscored (147.19s) --- PASS: TestAccAWSRoute53Record_weighted_alias (330.82s) --- PASS: TestAccAWSRoute53Record_weighted_basic (165.71s) --- PASS: TestAccAWSRoute53Record_weighted_to_simple_basic (222.40s) --- PASS: TestAccAWSRoute53Record_wildcard (193.78s) ```
…-aws into DSdatsme-master
…olving health_check_id Reference: #13012 Previously: ``` --- FAIL: TestAccAWSRoute53Record_HealthCheckId_TypeChange (136.55s) TestAccAWSRoute53Record_HealthCheckId_TypeChange: testing.go:684: Step 2 error: errors during apply: Error: [ERR]: Error building changeset: InvalidChangeBatch: [Tried to delete resource record set [name='test.notexample.com.', type='CNAME', set-identifier='test'] but the values provided do not match the current values, RRSet of type A with DNS name test.notexample.com. is not permitted because a conflicting RRSet of type CNAME with the same DNS name already exists in zone notexample.com.] TestAccAWSRoute53Record_HealthCheckId_SetIdentifierChange: testing.go:684: Step 2 error: errors during apply: --- FAIL: TestAccAWSRoute53Record_HealthCheckId_SetIdentifierChange (268.06s) Error: [ERR]: Error building changeset: InvalidChangeBatch: [Tried to delete resource record set [name='test.notexample.com.', type='A', set-identifier='test1'] but the values provided do not match the current values] ``` Output from acceptance testing: ``` --- PASS: TestAccAWSRoute53Record_Alias_Elb (191.18s) --- PASS: TestAccAWSRoute53Record_Alias_S3 (228.43s) --- PASS: TestAccAWSRoute53Record_Alias_Uppercase (194.76s) --- PASS: TestAccAWSRoute53Record_Alias_VpcEndpoint (604.56s) --- PASS: TestAccAWSRoute53Record_AliasChange (248.53s) --- PASS: TestAccAWSRoute53Record_allowOverwrite (242.92s) --- PASS: TestAccAWSRoute53Record_basic (190.78s) --- PASS: TestAccAWSRoute53Record_basic_fqdn (173.09s) --- PASS: TestAccAWSRoute53Record_caaSupport (148.19s) --- PASS: TestAccAWSRoute53Record_disappears (170.10s) --- PASS: TestAccAWSRoute53Record_disappears_MultipleRecords (273.12s) --- PASS: TestAccAWSRoute53Record_empty (183.30s) --- PASS: TestAccAWSRoute53Record_failover (228.90s) --- PASS: TestAccAWSRoute53Record_generatesSuffix (190.31s) --- PASS: TestAccAWSRoute53Record_geolocation_basic (156.71s) --- PASS: TestAccAWSRoute53Record_HealthCheckId_SetIdentifierChange (203.36s) --- PASS: TestAccAWSRoute53Record_HealthCheckId_TypeChange (188.13s) --- PASS: TestAccAWSRoute53Record_latency_basic (166.20s) --- PASS: TestAccAWSRoute53Record_longTXTrecord (176.16s) --- PASS: TestAccAWSRoute53Record_multivalue_answer_basic (209.59s) --- PASS: TestAccAWSRoute53Record_NameChange (232.12s) --- PASS: TestAccAWSRoute53Record_SetIdentifierChange (218.69s) --- PASS: TestAccAWSRoute53Record_spfSupport (156.84s) --- PASS: TestAccAWSRoute53Record_txtSupport (135.14s) --- PASS: TestAccAWSRoute53Record_TypeChange (179.22s) --- PASS: TestAccAWSRoute53Record_underscored (190.45s) --- PASS: TestAccAWSRoute53Record_weighted_alias (284.00s) --- PASS: TestAccAWSRoute53Record_weighted_basic (167.55s) --- PASS: TestAccAWSRoute53Record_weighted_to_simple_basic (219.55s) --- PASS: TestAccAWSRoute53Record_wildcard (193.54s) ```
…on creation + wait for delete + add `arn` attribute (#12005) Output from acceptance testing (unrelated consistent test failure due to #12506): ``` --- PASS: TestAccAWSSfnStateMachine_tags (55.38s) --- FAIL: TestAccAWSSfnStateMachine_createUpdate (61.93s) --- PASS: TestAccAWSSfnStateMachine_disappears (67.31s) ```
Copy-and-pasting this code will cause users to create VPCs that essentially cost $48 per day. So, I changed the "instance_tenancy" setting to "default" (it was "dedicated".) "default" is the normal mode of operation at AWS (shared instances.)
Add hardcoded AMI ID check
Output from acceptance testing: ``` --- PASS: TestAccAWSCustomerGateway_disappears (18.14s) --- PASS: TestAccAWSCustomerGateway_4ByteAsn (20.38s) --- PASS: TestAccAWSCustomerGateway_similarAlreadyExists (23.01s) --- PASS: TestAccAWSCustomerGateway_basic (36.37s) --- PASS: TestAccAWSCustomerGateway_tags (62.25s) ```
* Sagemaker example of "deploy your own model" * Exclude GitHub action workflow for Terraform 0.11 * Make example code Terraform 12 compatible
…e cluster (#14037) If you try to create an RDS instance with a different engine/version to the cluster, you get an InvalidParameterCombination error from Terraform and no instances. Changing the behaviour so that instances inherit their config from the cluster is a big change. This patch just tweaks the documented examples, so if people copy/paste the example and change the engine/version of the cluster, it will still work correctly. It also highlights that the engine/version should match between the instance and the cluster. Relates to #10585
r/launch_template: modify default_version
…arallelize new tests (#14065) Output from acceptance testing: ``` --- PASS: TestAccAWSLaunchTemplate_associatePublicIPAddress (83.66s) --- PASS: TestAccAWSLaunchTemplate_basic (18.66s) --- PASS: TestAccAWSLaunchTemplate_BlockDeviceMappings_EBS (44.60s) --- PASS: TestAccAWSLaunchTemplate_BlockDeviceMappings_EBS_DeleteOnTermination (80.12s) --- PASS: TestAccAWSLaunchTemplate_capacityReservation_preference (19.63s) --- PASS: TestAccAWSLaunchTemplate_capacityReservation_target (24.41s) --- PASS: TestAccAWSLaunchTemplate_cpuOptions (17.45s) --- PASS: TestAccAWSLaunchTemplate_creditSpecification_nonBurstable (19.60s) --- PASS: TestAccAWSLaunchTemplate_creditSpecification_t2 (19.71s) --- PASS: TestAccAWSLaunchTemplate_creditSpecification_t3 (19.74s) --- PASS: TestAccAWSLaunchTemplate_data (19.40s) --- PASS: TestAccAWSLaunchTemplate_defaultVersion (42.00s) --- PASS: TestAccAWSLaunchTemplate_description (31.44s) --- PASS: TestAccAWSLaunchTemplate_disappears (12.33s) --- PASS: TestAccAWSLaunchTemplate_EbsOptimized (70.24s) --- PASS: TestAccAWSLaunchTemplate_ElasticInferenceAccelerator (31.01s) --- PASS: TestAccAWSLaunchTemplate_hibernation (42.71s) --- PASS: TestAccAWSLaunchTemplate_IamInstanceProfile_EmptyConfigurationBlock (17.43s) --- PASS: TestAccAWSLaunchTemplate_instanceMarketOptions (81.64s) --- PASS: TestAccAWSLaunchTemplate_licenseSpecification (19.95s) --- PASS: TestAccAWSLaunchTemplate_metadataOptions (17.98s) --- PASS: TestAccAWSLaunchTemplate_networkInterface (39.09s) --- PASS: TestAccAWSLaunchTemplate_networkInterface_ipv6AddressCount (17.84s) --- PASS: TestAccAWSLaunchTemplate_networkInterface_ipv6Addresses (19.19s) --- PASS: TestAccAWSLaunchTemplate_networkInterfaceAddresses (37.13s) --- PASS: TestAccAWSLaunchTemplate_placement_partitionNum (34.66s) --- PASS: TestAccAWSLaunchTemplate_tags (31.81s) --- PASS: TestAccAWSLaunchTemplate_update (88.86s) --- PASS: TestAccAWSLaunchTemplate_updateDefaultVersion (53.21s) ```
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.
Community Note
Relates OR Closes #0000
Release note for CHANGELOG:
Output from acceptance testing: