Skip to content

Commit

Permalink
Upgrade to v3.67.0 of the AWS Terraform Provider (#1721)
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 authored Nov 29, 2021
1 parent b10e71e commit 8cdca73
Show file tree
Hide file tree
Showing 768 changed files with 58,426 additions and 1,166 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CHANGELOG
=========

## HEAD (Unreleased)
_(none)_
* Upgrade to v3.67.0 of the AWS Terraform Provider

---

Expand Down
4,843 changes: 4,748 additions & 95 deletions provider/cmd/pulumi-resource-aws/schema.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (

replace (
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20210629210550-59d24255d71f
github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20211119154650-363f3878c1f3
github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20211126142250-dc1d1293bc65
github.com/hashicorp/terraform-provider-aws/shim => ./shim
github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
)
8 changes: 4 additions & 4 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
github.com/aws/aws-sdk-go v1.42.5 h1:0xNoQrGh9InmUsT+9qzZ8QLfBEUsnev5BMeED6t6cKI=
github.com/aws/aws-sdk-go v1.42.5/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/aws/aws-sdk-go v1.42.9 h1:8ptAGgA+uC2TUbdvUeOVSfBocIZvGE2NKiLxkAcn1GA=
github.com/aws/aws-sdk-go v1.42.9/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
Expand Down Expand Up @@ -718,8 +718,8 @@ github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e h1:Di
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e/go.mod h1:sZ9FUzGO+yM41hsQHs/yIcj/Y993qMdBxBU5mpDmAfQ=
github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20210629210550-59d24255d71f h1:YWtQ7xeRQvB9h5Uwtrl9wDKRKkyLTXWBzU7x0c9VOZ4=
github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20210629210550-59d24255d71f/go.mod h1:grseeRo9g3yNkYW09iFlV8LG78jTa1ssBgouogQg/RU=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20211119154650-363f3878c1f3 h1:fpkTPTWOEMUuAbCDVbpPoIPC6aq5rqWuIlleebGpKbk=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20211119154650-363f3878c1f3/go.mod h1:cO8zE16eeebXY2wZ+jezVWxSXam0CpzdfS3sUTeP8dg=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20211126142250-dc1d1293bc65 h1:wW2PMxZ4W5W2LF/iUeFRgySj1MSRUoDfQoc6RDjZG54=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20211126142250-dc1d1293bc65/go.mod h1:yEpM6MJmGJKSB/WHjMnNbYbRWO9ydLwuaN5OkJExysw=
github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
Expand Down
26 changes: 18 additions & 8 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ const (
awsMod = "index" // the root index.
acmMod = "Acm" // AWS Certificate Manager
acmpcaMod = "Acmpca" // AWS Private Certificate Authority
accountMod = "Account" // Account
accessAnalyzerMod = "AccessAnalyzer" // Access Analyzer
ampMod = "Amp" // Amp
amplifyMod = "Amplify" // Amplify
Expand Down Expand Up @@ -342,6 +343,8 @@ func Provider() tfbridge.ProviderInfo {
"aws_acmpca_certificate_authority_certificate": {
Tok: awsResource(acmpcaMod, "CertificateAuthorityCertificate"),
},
// Account
"aws_account_alternate_contact": {Tok: awsResource(accountMod, "AlternativeContact")},
// AppSync
"aws_appsync_api_key": {
Tok: awsResource(appsyncMod, "ApiKey"),
Expand Down Expand Up @@ -1475,10 +1478,12 @@ func Provider() tfbridge.ProviderInfo {
"aws_emr_managed_scaling_policy": {Tok: awsResource(emrMod, "ManagedScalingPolicy")},
"aws_emr_instance_fleet": {Tok: awsResource(emrMod, "InstanceFleet")},
// FSX
"aws_fsx_lustre_file_system": {Tok: awsResource(fsxMod, "LustreFileSystem")},
"aws_fsx_windows_file_system": {Tok: awsResource(fsxMod, "WindowsFileSystem")},
"aws_fsx_backup": {Tok: awsResource(fsxMod, "Backup")},
"aws_fsx_ontap_file_system": {Tok: awsResource(fsxMod, "OntapFileSystem")},
"aws_fsx_lustre_file_system": {Tok: awsResource(fsxMod, "LustreFileSystem")},
"aws_fsx_windows_file_system": {Tok: awsResource(fsxMod, "WindowsFileSystem")},
"aws_fsx_backup": {Tok: awsResource(fsxMod, "Backup")},
"aws_fsx_ontap_file_system": {Tok: awsResource(fsxMod, "OntapFileSystem")},
"aws_fsx_ontap_storage_virtual_machine": {Tok: awsResource(fsxMod, "OntapStorageVirtualMachine")},
"aws_fsx_ontap_volume": {Tok: awsResource(fsxMod, "OntapVolume")},
// GameLift
"aws_gamelift_alias": {Tok: awsResource(gameliftMod, "Alias")},
"aws_gamelift_build": {Tok: awsResource(gameliftMod, "Build")},
Expand Down Expand Up @@ -2800,10 +2805,13 @@ func Provider() tfbridge.ProviderInfo {
"aws_appconfig_deployment": {Tok: awsResource(appConfigMod, "Deployment")},

// AppStream
"aws_appstream_stack": {Tok: awsResource(appStreamMod, "Stack")},
"aws_appstream_fleet": {Tok: awsResource(appStreamMod, "Fleet")},
"aws_appstream_image_builder": {Tok: awsResource(appStreamMod, "ImageBuilder")},
"aws_appstream_directory_config": {Tok: awsResource(appStreamMod, "DirectoryConfig")},
"aws_appstream_stack": {Tok: awsResource(appStreamMod, "Stack")},
"aws_appstream_fleet": {Tok: awsResource(appStreamMod, "Fleet")},
"aws_appstream_image_builder": {Tok: awsResource(appStreamMod, "ImageBuilder")},
"aws_appstream_directory_config": {Tok: awsResource(appStreamMod, "DirectoryConfig")},
"aws_appstream_fleet_stack_association": {Tok: awsResource(appStreamMod, "FleetStackAssociation")},
"aws_appstream_user_stack_association": {Tok: awsResource(appStreamMod, "UserStackAssociation")},
"aws_appstream_user": {Tok: awsResource(appStreamMod, "User")},

// mwaa
"aws_mwaa_environment": {Tok: awsResource(mwaaMod, "Environment")},
Expand Down Expand Up @@ -3962,6 +3970,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_ec2_host": {Tok: awsDataSource(ec2Mod, "getDedicatedHost")},
"aws_ec2_managed_prefix_list": {Tok: awsDataSource(ec2Mod, "getManagedPrefixList")},
"aws_ec2_transit_gateway_route_tables": {Tok: awsDataSource(ec2Mod, "getTransitGatewayRouteTables")},
"aws_ec2_instance_types": {Tok: awsDataSource(ec2Mod, "getInstanceTypes")},
// EC2 Transit Gateway
"aws_ec2_transit_gateway": {Tok: awsDataSource(ec2TransitGatewayMod, "getTransitGateway")},
"aws_ec2_transit_gateway_dx_gateway_attachment": {
Expand Down Expand Up @@ -4249,6 +4258,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_imagebuilder_image_pipeline": {Tok: awsDataSource(imageBuilderMod, "getImagePipeline")},
"aws_imagebuilder_image_recipe": {Tok: awsDataSource(imageBuilderMod, "getImageRecipe")},
"aws_imagebuilder_image": {Tok: awsDataSource(imageBuilderMod, "getImage")},
"aws_imagebuilder_image_recipes": {Tok: awsDataSource(imageBuilderMod, "getImageRecipes")},
//signer
"aws_signer_signing_job": {Tok: awsDataSource(signerMod, "getSigningJob")},
"aws_signer_signing_profile": {Tok: awsDataSource(signerMod, "getSigningProfile")},
Expand Down
2 changes: 1 addition & 1 deletion provider/shim/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ require (
github.com/hashicorp/terraform-provider-aws v1.60.1-0.20211105002759-77bad27d9f23
)

replace github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20211119154650-363f3878c1f3
replace github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20211126142250-dc1d1293bc65
8 changes: 4 additions & 4 deletions provider/shim/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.42.5 h1:0xNoQrGh9InmUsT+9qzZ8QLfBEUsnev5BMeED6t6cKI=
github.com/aws/aws-sdk-go v1.42.5/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/aws/aws-sdk-go v1.42.9 h1:8ptAGgA+uC2TUbdvUeOVSfBocIZvGE2NKiLxkAcn1GA=
github.com/aws/aws-sdk-go v1.42.9/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
Expand Down Expand Up @@ -307,8 +307,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
github.com/pquerna/otp v1.3.0 h1:oJV/SkzR33anKXwQU3Of42rL4wbrffP4uvUf1SvS5Xs=
github.com/pquerna/otp v1.3.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20211119154650-363f3878c1f3 h1:fpkTPTWOEMUuAbCDVbpPoIPC6aq5rqWuIlleebGpKbk=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20211119154650-363f3878c1f3/go.mod h1:cO8zE16eeebXY2wZ+jezVWxSXam0CpzdfS3sUTeP8dg=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20211126142250-dc1d1293bc65 h1:wW2PMxZ4W5W2LF/iUeFRgySj1MSRUoDfQoc6RDjZG54=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20211126142250-dc1d1293bc65/go.mod h1:yEpM6MJmGJKSB/WHjMnNbYbRWO9ydLwuaN5OkJExysw=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
Expand Down
195 changes: 195 additions & 0 deletions sdk/dotnet/Account/AlternativeContact.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.Aws.Account
{
/// <summary>
/// Manages the specified alternate contact attached to an AWS Account.
///
/// ## Example Usage
///
/// ```csharp
/// using Pulumi;
/// using Aws = Pulumi.Aws;
///
/// class MyStack : Stack
/// {
/// public MyStack()
/// {
/// var operations = new Aws.Account.AlternativeContact("operations", new Aws.Account.AlternativeContactArgs
/// {
/// AlternateContactType = "OPERATIONS",
/// EmailAddress = "[email protected]",
/// PhoneNumber = "+1234567890",
/// Title = "Example",
/// });
/// }
///
/// }
/// ```
///
/// ## Import
///
/// The current Alternate Contact can be imported using the `alternate_contact_type`, e.g.,
///
/// ```sh
/// $ pulumi import aws:account/alternativeContact:AlternativeContact operations OPERATIONS
/// ```
/// </summary>
[AwsResourceType("aws:account/alternativeContact:AlternativeContact")]
public partial class AlternativeContact : Pulumi.CustomResource
{
/// <summary>
/// The type of the alternate contact. Allowed values are: `BILLING`, `OPERATIONS`, `SECURITY`.
/// </summary>
[Output("alternateContactType")]
public Output<string> AlternateContactType { get; private set; } = null!;

/// <summary>
/// An email address for the alternate contact.
/// </summary>
[Output("emailAddress")]
public Output<string> EmailAddress { get; private set; } = null!;

/// <summary>
/// The name of the alternate contact.
/// </summary>
[Output("name")]
public Output<string> Name { get; private set; } = null!;

/// <summary>
/// A phone number for the alternate contact.
/// </summary>
[Output("phoneNumber")]
public Output<string> PhoneNumber { get; private set; } = null!;

/// <summary>
/// A title for the alternate contact.
/// </summary>
[Output("title")]
public Output<string> Title { get; private set; } = null!;


/// <summary>
/// Create a AlternativeContact resource with the given unique name, arguments, and options.
/// </summary>
///
/// <param name="name">The unique name of the resource</param>
/// <param name="args">The arguments used to populate this resource's properties</param>
/// <param name="options">A bag of options that control this resource's behavior</param>
public AlternativeContact(string name, AlternativeContactArgs args, CustomResourceOptions? options = null)
: base("aws:account/alternativeContact:AlternativeContact", name, args ?? new AlternativeContactArgs(), MakeResourceOptions(options, ""))
{
}

private AlternativeContact(string name, Input<string> id, AlternativeContactState? state = null, CustomResourceOptions? options = null)
: base("aws:account/alternativeContact:AlternativeContact", name, state, MakeResourceOptions(options, id))
{
}

private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options, Input<string>? id)
{
var defaultOptions = new CustomResourceOptions
{
Version = Utilities.Version,
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
// Override the ID if one was specified for consistency with other language SDKs.
merged.Id = id ?? merged.Id;
return merged;
}
/// <summary>
/// Get an existing AlternativeContact resource's state with the given name, ID, and optional extra
/// properties used to qualify the lookup.
/// </summary>
///
/// <param name="name">The unique name of the resulting resource.</param>
/// <param name="id">The unique provider ID of the resource to lookup.</param>
/// <param name="state">Any extra arguments used during the lookup.</param>
/// <param name="options">A bag of options that control this resource's behavior</param>
public static AlternativeContact Get(string name, Input<string> id, AlternativeContactState? state = null, CustomResourceOptions? options = null)
{
return new AlternativeContact(name, id, state, options);
}
}

public sealed class AlternativeContactArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The type of the alternate contact. Allowed values are: `BILLING`, `OPERATIONS`, `SECURITY`.
/// </summary>
[Input("alternateContactType", required: true)]
public Input<string> AlternateContactType { get; set; } = null!;

/// <summary>
/// An email address for the alternate contact.
/// </summary>
[Input("emailAddress", required: true)]
public Input<string> EmailAddress { get; set; } = null!;

/// <summary>
/// The name of the alternate contact.
/// </summary>
[Input("name")]
public Input<string>? Name { get; set; }

/// <summary>
/// A phone number for the alternate contact.
/// </summary>
[Input("phoneNumber", required: true)]
public Input<string> PhoneNumber { get; set; } = null!;

/// <summary>
/// A title for the alternate contact.
/// </summary>
[Input("title", required: true)]
public Input<string> Title { get; set; } = null!;

public AlternativeContactArgs()
{
}
}

public sealed class AlternativeContactState : Pulumi.ResourceArgs
{
/// <summary>
/// The type of the alternate contact. Allowed values are: `BILLING`, `OPERATIONS`, `SECURITY`.
/// </summary>
[Input("alternateContactType")]
public Input<string>? AlternateContactType { get; set; }

/// <summary>
/// An email address for the alternate contact.
/// </summary>
[Input("emailAddress")]
public Input<string>? EmailAddress { get; set; }

/// <summary>
/// The name of the alternate contact.
/// </summary>
[Input("name")]
public Input<string>? Name { get; set; }

/// <summary>
/// A phone number for the alternate contact.
/// </summary>
[Input("phoneNumber")]
public Input<string>? PhoneNumber { get; set; }

/// <summary>
/// A title for the alternate contact.
/// </summary>
[Input("title")]
public Input<string>? Title { get; set; }

public AlternativeContactState()
{
}
}
}
1 change: 1 addition & 0 deletions sdk/dotnet/Account/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A Pulumi package for creating and managing Amazon Web Services (AWS) cloud resources.
8 changes: 8 additions & 0 deletions sdk/dotnet/Alb/GetLoadBalancer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,12 @@ public sealed class GetLoadBalancerResult
public readonly string Arn;
public readonly string ArnSuffix;
public readonly string CustomerOwnedIpv4Pool;
public readonly string DesyncMitigationMode;
public readonly string DnsName;
public readonly bool DropInvalidHeaderFields;
public readonly bool EnableDeletionProtection;
public readonly bool EnableHttp2;
public readonly bool EnableWafFailOpen;
/// <summary>
/// The provider-assigned unique ID for this managed resource.
/// </summary>
Expand All @@ -192,6 +194,8 @@ private GetLoadBalancerResult(

string customerOwnedIpv4Pool,

string desyncMitigationMode,

string dnsName,

bool dropInvalidHeaderFields,
Expand All @@ -200,6 +204,8 @@ private GetLoadBalancerResult(

bool enableHttp2,

bool enableWafFailOpen,

string id,

int idleTimeout,
Expand Down Expand Up @@ -228,10 +234,12 @@ private GetLoadBalancerResult(
Arn = arn;
ArnSuffix = arnSuffix;
CustomerOwnedIpv4Pool = customerOwnedIpv4Pool;
DesyncMitigationMode = desyncMitigationMode;
DnsName = dnsName;
DropInvalidHeaderFields = dropInvalidHeaderFields;
EnableDeletionProtection = enableDeletionProtection;
EnableHttp2 = enableHttp2;
EnableWafFailOpen = enableWafFailOpen;
Id = id;
IdleTimeout = idleTimeout;
Internal = @internal;
Expand Down
Loading

0 comments on commit 8cdca73

Please sign in to comment.