Skip to content

Commit

Permalink
Upgrade to v2.70.0 of the AWS Terraform Provider (#1043)
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 authored Jul 10, 2020
1 parent b41c6ba commit 3f7adb9
Show file tree
Hide file tree
Showing 58 changed files with 1,795 additions and 140 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 v2.70.0 of the AWS Terraform Provider

---

Expand Down
234 changes: 208 additions & 26 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 @@ -14,5 +14,5 @@ require (
replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible
github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
github.com/terraform-providers/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20200703092209-3ac195e83e82
github.com/terraform-providers/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20200710182822-58d8f3da6292
)
2 changes: 2 additions & 0 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,8 @@ github.com/pulumi/terraform-provider-aws v1.38.1-0.20200626105707-4a7fb5e90938 h
github.com/pulumi/terraform-provider-aws v1.38.1-0.20200626105707-4a7fb5e90938/go.mod h1:0U3OgA2uDYSc7gNkdWA92+/BxWXwuYhWqqZ4UhM1RCw=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20200703092209-3ac195e83e82 h1:cUjl9Qvmm8tXsLpD8Sq3oavkwv6dJiEzQTs6I4yyfm0=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20200703092209-3ac195e83e82/go.mod h1:tJCY7WQBTQPyFIf0JOkHSwTMS46J/JTa8dxhwtMcwdY=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20200710182822-58d8f3da6292 h1:GHpeO1GW9gGXw++zBBivwk2s09baCLx4pdQRCUyzBv8=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20200710182822-58d8f3da6292/go.mod h1:tJCY7WQBTQPyFIf0JOkHSwTMS46J/JTa8dxhwtMcwdY=
github.com/pulumi/tf2pulumi v0.8.1-0.20200610210702-8e5d1a569c4a h1:CUbap8oEhlXRiqVBcAGiW63iXuDY7iIwQLM4r7y8lw8=
github.com/pulumi/tf2pulumi v0.8.1-0.20200610210702-8e5d1a569c4a/go.mod h1:lE39suxXfTqjNHg8PxtPUdek3wnTTdnoYXVpQdFGmEo=
github.com/pulumi/tf2pulumi v0.8.1-0.20200630203740-1846524be4ec h1:C0l29EHsfhH+reeRSmqr0sIzJipQpXssof3YZurRrVo=
Expand Down
2 changes: 2 additions & 0 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,8 @@ func Provider() tfbridge.ProviderInfo {
// EC2 Client VPN
"aws_ec2_client_vpn_endpoint": {Tok: awsResource(ec2ClientVpnMod, "Endpoint")},
"aws_ec2_client_vpn_network_association": {Tok: awsResource(ec2ClientVpnMod, "NetworkAssociation")},
"aws_ec2_client_vpn_authorization_rule": {Tok: awsResource(ec2ClientVpnMod, "AuthorizationRule")},
"aws_ec2_client_vpn_route": {Tok: awsResource(ec2ClientVpnMod, "Route")},
// EC2 Transit Gateway
"aws_ec2_transit_gateway": {
Tok: awsResource(ec2TransitGatewayMod, "TransitGateway"),
Expand Down
6 changes: 3 additions & 3 deletions sdk/dotnet/Alb/TargetGroupAttachment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ namespace Pulumi.Aws.Alb
public partial class TargetGroupAttachment : Pulumi.CustomResource
{
/// <summary>
/// The Availability Zone where the IP address of the target is to be registered.
/// The Availability Zone where the IP address of the target is to be registered. If the private ip address is outside of the VPC scope, this value must be set to 'all'.
/// </summary>
[Output("availabilityZone")]
public Output<string?> AvailabilityZone { get; private set; } = null!;
Expand Down Expand Up @@ -157,7 +157,7 @@ public static TargetGroupAttachment Get(string name, Input<string> id, TargetGro
public sealed class TargetGroupAttachmentArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The Availability Zone where the IP address of the target is to be registered.
/// The Availability Zone where the IP address of the target is to be registered. If the private ip address is outside of the VPC scope, this value must be set to 'all'.
/// </summary>
[Input("availabilityZone")]
public Input<string>? AvailabilityZone { get; set; }
Expand Down Expand Up @@ -188,7 +188,7 @@ public TargetGroupAttachmentArgs()
public sealed class TargetGroupAttachmentState : Pulumi.ResourceArgs
{
/// <summary>
/// The Availability Zone where the IP address of the target is to be registered.
/// The Availability Zone where the IP address of the target is to be registered. If the private ip address is outside of the VPC scope, this value must be set to 'all'.
/// </summary>
[Input("availabilityZone")]
public Input<string>? AvailabilityZone { get; set; }
Expand Down
6 changes: 3 additions & 3 deletions sdk/dotnet/ApplicationLoadBalancing/TargetGroupAttachment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace Pulumi.Aws.ApplicationLoadBalancing
public partial class TargetGroupAttachment : Pulumi.CustomResource
{
/// <summary>
/// The Availability Zone where the IP address of the target is to be registered.
/// The Availability Zone where the IP address of the target is to be registered. If the private ip address is outside of the VPC scope, this value must be set to 'all'.
/// </summary>
[Output("availabilityZone")]
public Output<string?> AvailabilityZone { get; private set; } = null!;
Expand Down Expand Up @@ -154,7 +154,7 @@ public static TargetGroupAttachment Get(string name, Input<string> id, TargetGro
public sealed class TargetGroupAttachmentArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The Availability Zone where the IP address of the target is to be registered.
/// The Availability Zone where the IP address of the target is to be registered. If the private ip address is outside of the VPC scope, this value must be set to 'all'.
/// </summary>
[Input("availabilityZone")]
public Input<string>? AvailabilityZone { get; set; }
Expand Down Expand Up @@ -185,7 +185,7 @@ public TargetGroupAttachmentArgs()
public sealed class TargetGroupAttachmentState : Pulumi.ResourceArgs
{
/// <summary>
/// The Availability Zone where the IP address of the target is to be registered.
/// The Availability Zone where the IP address of the target is to be registered. If the private ip address is outside of the VPC scope, this value must be set to 'all'.
/// </summary>
[Input("availabilityZone")]
public Input<string>? AvailabilityZone { get; set; }
Expand Down
28 changes: 26 additions & 2 deletions sdk/dotnet/Ec2/LaunchTemplate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public partial class LaunchTemplate : Pulumi.CustomResource
public Output<Outputs.LaunchTemplateCreditSpecification?> CreditSpecification { get; private set; } = null!;

/// <summary>
/// The default version of the launch template.
/// Default Version of the launch template.
/// </summary>
[Output("defaultVersion")]
public Output<int> DefaultVersion { get; private set; } = null!;
Expand Down Expand Up @@ -209,6 +209,12 @@ public partial class LaunchTemplate : Pulumi.CustomResource
[Output("tags")]
public Output<ImmutableDictionary<string, string>?> Tags { get; private set; } = null!;

/// <summary>
/// Whether to update Default Version each update. Conflicts with `default_version`.
/// </summary>
[Output("updateDefaultVersion")]
public Output<bool?> UpdateDefaultVersion { get; private set; } = null!;

/// <summary>
/// The Base64-encoded user data to provide when launching the instance.
/// </summary>
Expand Down Expand Up @@ -299,6 +305,12 @@ public InputList<Inputs.LaunchTemplateBlockDeviceMappingArgs> BlockDeviceMapping
[Input("creditSpecification")]
public Input<Inputs.LaunchTemplateCreditSpecificationArgs>? CreditSpecification { get; set; }

/// <summary>
/// Default Version of the launch template.
/// </summary>
[Input("defaultVersion")]
public Input<int>? DefaultVersion { get; set; }

/// <summary>
/// Description of the launch template.
/// </summary>
Expand Down Expand Up @@ -486,6 +498,12 @@ public InputMap<string> Tags
set => _tags = value;
}

/// <summary>
/// Whether to update Default Version each update. Conflicts with `default_version`.
/// </summary>
[Input("updateDefaultVersion")]
public Input<bool>? UpdateDefaultVersion { get; set; }

/// <summary>
/// The Base64-encoded user data to provide when launching the instance.
/// </summary>
Expand Down Expand Up @@ -550,7 +568,7 @@ public InputList<Inputs.LaunchTemplateBlockDeviceMappingGetArgs> BlockDeviceMapp
public Input<Inputs.LaunchTemplateCreditSpecificationGetArgs>? CreditSpecification { get; set; }

/// <summary>
/// The default version of the launch template.
/// Default Version of the launch template.
/// </summary>
[Input("defaultVersion")]
public Input<int>? DefaultVersion { get; set; }
Expand Down Expand Up @@ -748,6 +766,12 @@ public InputMap<string> Tags
set => _tags = value;
}

/// <summary>
/// Whether to update Default Version each update. Conflicts with `default_version`.
/// </summary>
[Input("updateDefaultVersion")]
public Input<bool>? UpdateDefaultVersion { get; set; }

/// <summary>
/// The Base64-encoded user data to provide when launching the instance.
/// </summary>
Expand Down
186 changes: 186 additions & 0 deletions sdk/dotnet/Ec2ClientVpn/AuthorizationRule.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
// *** 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.Ec2ClientVpn
{
/// <summary>
/// Provides authorization rules for AWS Client VPN endpoints. For more information on usage, please see the
/// [AWS Client VPN Administrator's Guide](https://docs.aws.amazon.com/vpn/latest/clientvpn-admin/what-is.html).
///
/// ## Example Usage
///
/// ```csharp
/// using Pulumi;
/// using Aws = Pulumi.Aws;
///
/// class MyStack : Stack
/// {
/// public MyStack()
/// {
/// var example = new Aws.Ec2ClientVpn.AuthorizationRule("example", new Aws.Ec2ClientVpn.AuthorizationRuleArgs
/// {
/// AuthorizeAllGroups = true,
/// ClientVpnEndpointId = aws_ec2_client_vpn_endpoint.Example.Id,
/// TargetNetworkCidr = aws_subnet.Example.Cidr_block,
/// });
/// }
///
/// }
/// ```
/// </summary>
public partial class AuthorizationRule : Pulumi.CustomResource
{
/// <summary>
/// The ID of the group to which the authorization rule grants access. One of `access_group_id` or `authorize_all_groups` must be set.
/// </summary>
[Output("accessGroupId")]
public Output<string?> AccessGroupId { get; private set; } = null!;

/// <summary>
/// Indicates whether the authorization rule grants access to all clients. One of `access_group_id` or `authorize_all_groups` must be set.
/// </summary>
[Output("authorizeAllGroups")]
public Output<bool?> AuthorizeAllGroups { get; private set; } = null!;

/// <summary>
/// The ID of the Client VPN endpoint.
/// </summary>
[Output("clientVpnEndpointId")]
public Output<string> ClientVpnEndpointId { get; private set; } = null!;

/// <summary>
/// A brief description of the authorization rule.
/// </summary>
[Output("description")]
public Output<string?> Description { get; private set; } = null!;

/// <summary>
/// The IPv4 address range, in CIDR notation, of the network to which the authorization rule applies.
/// </summary>
[Output("targetNetworkCidr")]
public Output<string> TargetNetworkCidr { get; private set; } = null!;


/// <summary>
/// Create a AuthorizationRule 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 AuthorizationRule(string name, AuthorizationRuleArgs args, CustomResourceOptions? options = null)
: base("aws:ec2clientvpn/authorizationRule:AuthorizationRule", name, args ?? new AuthorizationRuleArgs(), MakeResourceOptions(options, ""))
{
}

private AuthorizationRule(string name, Input<string> id, AuthorizationRuleState? state = null, CustomResourceOptions? options = null)
: base("aws:ec2clientvpn/authorizationRule:AuthorizationRule", 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 AuthorizationRule 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 AuthorizationRule Get(string name, Input<string> id, AuthorizationRuleState? state = null, CustomResourceOptions? options = null)
{
return new AuthorizationRule(name, id, state, options);
}
}

public sealed class AuthorizationRuleArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The ID of the group to which the authorization rule grants access. One of `access_group_id` or `authorize_all_groups` must be set.
/// </summary>
[Input("accessGroupId")]
public Input<string>? AccessGroupId { get; set; }

/// <summary>
/// Indicates whether the authorization rule grants access to all clients. One of `access_group_id` or `authorize_all_groups` must be set.
/// </summary>
[Input("authorizeAllGroups")]
public Input<bool>? AuthorizeAllGroups { get; set; }

/// <summary>
/// The ID of the Client VPN endpoint.
/// </summary>
[Input("clientVpnEndpointId", required: true)]
public Input<string> ClientVpnEndpointId { get; set; } = null!;

/// <summary>
/// A brief description of the authorization rule.
/// </summary>
[Input("description")]
public Input<string>? Description { get; set; }

/// <summary>
/// The IPv4 address range, in CIDR notation, of the network to which the authorization rule applies.
/// </summary>
[Input("targetNetworkCidr", required: true)]
public Input<string> TargetNetworkCidr { get; set; } = null!;

public AuthorizationRuleArgs()
{
}
}

public sealed class AuthorizationRuleState : Pulumi.ResourceArgs
{
/// <summary>
/// The ID of the group to which the authorization rule grants access. One of `access_group_id` or `authorize_all_groups` must be set.
/// </summary>
[Input("accessGroupId")]
public Input<string>? AccessGroupId { get; set; }

/// <summary>
/// Indicates whether the authorization rule grants access to all clients. One of `access_group_id` or `authorize_all_groups` must be set.
/// </summary>
[Input("authorizeAllGroups")]
public Input<bool>? AuthorizeAllGroups { get; set; }

/// <summary>
/// The ID of the Client VPN endpoint.
/// </summary>
[Input("clientVpnEndpointId")]
public Input<string>? ClientVpnEndpointId { get; set; }

/// <summary>
/// A brief description of the authorization rule.
/// </summary>
[Input("description")]
public Input<string>? Description { get; set; }

/// <summary>
/// The IPv4 address range, in CIDR notation, of the network to which the authorization rule applies.
/// </summary>
[Input("targetNetworkCidr")]
public Input<string>? TargetNetworkCidr { get; set; }

public AuthorizationRuleState()
{
}
}
}
6 changes: 3 additions & 3 deletions sdk/dotnet/Ec2ClientVpn/Endpoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public partial class Endpoint : Pulumi.CustomResource
public Output<string> Status { get; private set; } = null!;

/// <summary>
/// A map of tags to assign to the resource.
/// A mapping of tags to assign to the resource.
/// </summary>
[Output("tags")]
public Output<ImmutableDictionary<string, string>?> Tags { get; private set; } = null!;
Expand Down Expand Up @@ -226,7 +226,7 @@ public InputList<string> DnsServers
private InputMap<string>? _tags;

/// <summary>
/// A map of tags to assign to the resource.
/// A mapping of tags to assign to the resource.
/// </summary>
public InputMap<string> Tags
{
Expand Down Expand Up @@ -323,7 +323,7 @@ public InputList<string> DnsServers
private InputMap<string>? _tags;

/// <summary>
/// A map of tags to assign to the resource.
/// A mapping of tags to assign to the resource.
/// </summary>
public InputMap<string> Tags
{
Expand Down
Loading

0 comments on commit 3f7adb9

Please sign in to comment.