Skip to content

Commit

Permalink
Upgrade to v3.24.0 of the AWS Terraform Provider (#1305)
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 authored Jan 19, 2021
1 parent 8d41bb8 commit 1432460
Show file tree
Hide file tree
Showing 271 changed files with 18,272 additions and 2,901 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)

* Update to v3.24.1 of the AWS Terraform Provider
* Revert auto-naming of RDS Cluster `clusterIdentifier`.

---
Expand Down
2,345 changes: 2,055 additions & 290 deletions provider/cmd/pulumi-resource-aws/schema.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.15
require (
github.com/hashicorp/aws-sdk-go-base v0.7.0
github.com/mitchellh/go-homedir v1.1.0
github.com/pulumi/pulumi-terraform-bridge v1.8.4
github.com/pulumi/pulumi-terraform-bridge/v2 v2.17.1-0.20201219002337-a0c25bd3e147
github.com/pulumi/pulumi/pkg/v2 v2.16.2
github.com/pulumi/pulumi/sdk/v2 v2.16.2
Expand All @@ -15,5 +16,5 @@ replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20201218231525-9cca98608a5e
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.20210108124814-c24243f79db6
github.com/terraform-providers/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20210115192741-47ff991625c0
)
74 changes: 72 additions & 2 deletions provider/go.sum

Large diffs are not rendered by default.

29 changes: 23 additions & 6 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ const (
glueMod = "Glue" // Glue
guarddutyMod = "GuardDuty" // Guard Duty
iamMod = "Iam" // Identity and Access Management (IAM)
identityStoreMod = "IdentityStore" // Identity Store
imageBuilderMod = "ImageBuilder" // ImageBuilder
inspectorMod = "Inspector" // Inspector
iotMod = "Iot" // Internet of Things (IoT)
Expand Down Expand Up @@ -663,6 +664,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_cloudwatch_log_resource_policy": {Tok: awsResource(cloudwatchMod, "LogResourcePolicy")},
"aws_cloudwatch_log_stream": {Tok: awsResource(cloudwatchMod, "LogStream")},
"aws_cloudwatch_event_bus": {Tok: awsResource(cloudwatchMod, "EventBus")},
"aws_cloudwatch_composite_alarm": {Tok: awsResource(cloudwatchMod, "CompositeAlarm")},
"aws_cloudwatch_log_subscription_filter": {
Tok: awsResource(cloudwatchMod, "LogSubscriptionFilter"),
Fields: map[string]*tfbridge.SchemaInfo{
Expand Down Expand Up @@ -1940,6 +1942,7 @@ func Provider() tfbridge.ProviderInfo {
},
},
"aws_route53_health_check": {Tok: awsResource(route53Mod, "HealthCheck")},
"aws_route53_resolver_dnssec_config": {Tok: awsResource(route53Mod, "ResolverDnsSecConfig")},
"aws_route53_resolver_query_log_config": {Tok: awsResource(route53Mod, "ResolverQueryLogConfig")},
"aws_route53_resolver_query_log_config_association": {
Tok: awsResource(route53Mod, "ResolverQueryLogConfigAssociation"),
Expand All @@ -1951,6 +1954,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_sagemaker_notebook_instance": {Tok: awsResource(sagemakerMod, "NotebookInstance")},
"aws_sagemaker_code_repository": {Tok: awsResource(sagemakerMod, "CodeRepository")},
"aws_sagemaker_image": {Tok: awsResource(sagemakerMod, "Image")},
"aws_sagemaker_domain": {Tok: awsResource(sagemakerMod, "Domain")},
"aws_sagemaker_notebook_instance_lifecycle_configuration": {
Tok: awsResource(sagemakerMod, "NotebookInstanceLifecycleConfiguration"),
},
Expand Down Expand Up @@ -2249,6 +2253,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_servicequotas_service_quota": {Tok: awsResource(servicequotasMod, "ServiceQuota")},
// FMS
"aws_fms_admin_account": {Tok: awsResource(fmsMod, "AdminAccount")},
"aws_fms_policy": {Tok: awsResource(fmsMod, "Policy")},
// QLDB
"aws_qldb_ledger": {Tok: awsResource(qldbMod, "Ledger")},
// Workspaces
Expand Down Expand Up @@ -2416,6 +2421,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_ssoadmin_managed_policy_attachment": {Tok: awsResource(ssoAdminMod, "ManagedPolicyAttachment")},
"aws_ssoadmin_permission_set": {Tok: awsResource(ssoAdminMod, "PermissionSet")},
"aws_ssoadmin_permission_set_inline_policy": {Tok: awsResource(ssoAdminMod, "PermissionSetInlinePolicy")},
"aws_ssoadmin_account_assignment": {Tok: awsResource(ssoAdminMod, "AccountAssignment")},
},
ExtraTypes: map[string]schema.ComplexTypeSpec{
"aws:index/Region:Region": {
Expand Down Expand Up @@ -3427,10 +3433,11 @@ func Provider() tfbridge.ProviderInfo {
// AWS Private Certificate Authority
"aws_acmpca_certificate_authority": {Tok: awsDataSource(acmpcaMod, "getCertificateAuthority")},
// API Gateway
"aws_api_gateway_api_key": {Tok: awsDataSource(apigatewayMod, "getKey")},
"aws_api_gateway_resource": {Tok: awsDataSource(apigatewayMod, "getResource")},
"aws_api_gateway_rest_api": {Tok: awsDataSource(apigatewayMod, "getRestApi")},
"aws_api_gateway_vpc_link": {Tok: awsDataSource(apigatewayMod, "getVpcLink")},
"aws_api_gateway_api_key": {Tok: awsDataSource(apigatewayMod, "getKey")},
"aws_api_gateway_resource": {Tok: awsDataSource(apigatewayMod, "getResource")},
"aws_api_gateway_rest_api": {Tok: awsDataSource(apigatewayMod, "getRestApi")},
"aws_api_gateway_vpc_link": {Tok: awsDataSource(apigatewayMod, "getVpcLink")},
"aws_api_gateway_domain_name": {Tok: awsDataSource(apigatewayMod, "getDomainName")},
// Autoscaling
"aws_autoscaling_group": {Tok: awsDataSource(autoscalingMod, "getGroup")},
// Batch
Expand Down Expand Up @@ -3651,6 +3658,9 @@ func Provider() tfbridge.ProviderInfo {
"aws_iam_role": {Tok: awsDataSource(iamMod, "getRole")},
"aws_iam_server_certificate": {Tok: awsDataSource(iamMod, "getServerCertificate")},
"aws_iam_user": {Tok: awsDataSource(iamMod, "getUser")},
// IdentityStore
"aws_identitystore_group": {Tok: awsDataSource(identityStoreMod, "getGroup")},
"aws_identitystore_user": {Tok: awsDataSource(identityStoreMod, "getUser")},
// Inspector
"aws_inspector_rules_packages": {Tok: awsDataSource(inspectorMod, "getRulesPackages")},
// Kinesis
Expand Down Expand Up @@ -3706,8 +3716,15 @@ func Provider() tfbridge.ProviderInfo {
// Transfer
"aws_transfer_server": {Tok: awsDataSource(transferMod, "getServer")},
// Workspaces
"aws_workspaces_bundle": {Tok: awsDataSource(workspacesMod, "getBundle")},
"aws_workspaces_directory": {Tok: awsDataSource(workspacesMod, "getDirectory")},
"aws_workspaces_bundle": {Tok: awsDataSource(workspacesMod, "getBundle")},
"aws_workspaces_directory": {
Tok: awsDataSource(workspacesMod, "getDirectory"),
Fields: map[string]*tfbridge.SchemaInfo{
"workspace_creation_properties": {
MaxItemsOne: boolRef(true),
},
},
},
"aws_workspaces_image": {Tok: awsDataSource(workspacesMod, "getImage")},
"aws_workspaces_workspace": {Tok: awsDataSource(workspacesMod, "getWorkspace")},
// MSK
Expand Down
18 changes: 18 additions & 0 deletions sdk/dotnet/ApiGateway/DomainName.cs
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,12 @@ public partial class DomainName : Pulumi.CustomResource
[Output("endpointConfiguration")]
public Output<Outputs.DomainNameEndpointConfiguration> EndpointConfiguration { get; private set; } = null!;

/// <summary>
/// The mutual TLS authentication configuration for the domain name. Defined below.
/// </summary>
[Output("mutualTlsAuthentication")]
public Output<Outputs.DomainNameMutualTlsAuthentication?> MutualTlsAuthentication { get; private set; } = null!;

/// <summary>
/// The ARN for an AWS-managed certificate. AWS Certificate Manager is the only supported source. Used when a regional domain name is desired. Conflicts with `certificate_arn`, `certificate_name`, `certificate_body`, `certificate_chain`, and `certificate_private_key`.
/// </summary>
Expand Down Expand Up @@ -427,6 +433,12 @@ public sealed class DomainNameArgs : Pulumi.ResourceArgs
[Input("endpointConfiguration")]
public Input<Inputs.DomainNameEndpointConfigurationArgs>? EndpointConfiguration { get; set; }

/// <summary>
/// The mutual TLS authentication configuration for the domain name. Defined below.
/// </summary>
[Input("mutualTlsAuthentication")]
public Input<Inputs.DomainNameMutualTlsAuthenticationArgs>? MutualTlsAuthentication { get; set; }

/// <summary>
/// The ARN for an AWS-managed certificate. AWS Certificate Manager is the only supported source. Used when a regional domain name is desired. Conflicts with `certificate_arn`, `certificate_name`, `certificate_body`, `certificate_chain`, and `certificate_private_key`.
/// </summary>
Expand Down Expand Up @@ -541,6 +553,12 @@ public sealed class DomainNameState : Pulumi.ResourceArgs
[Input("endpointConfiguration")]
public Input<Inputs.DomainNameEndpointConfigurationGetArgs>? EndpointConfiguration { get; set; }

/// <summary>
/// The mutual TLS authentication configuration for the domain name. Defined below.
/// </summary>
[Input("mutualTlsAuthentication")]
public Input<Inputs.DomainNameMutualTlsAuthenticationGetArgs>? MutualTlsAuthentication { get; set; }

/// <summary>
/// The ARN for an AWS-managed certificate. AWS Certificate Manager is the only supported source. Used when a regional domain name is desired. Conflicts with `certificate_arn`, `certificate_name`, `certificate_body`, `certificate_chain`, and `certificate_private_key`.
/// </summary>
Expand Down
181 changes: 181 additions & 0 deletions sdk/dotnet/ApiGateway/GetDomainName.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
// *** 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.ApiGateway
{
public static class GetDomainName
{
/// <summary>
/// Use this data source to get the custom domain name for use with AWS API Gateway.
///
/// {{% examples %}}
/// ## Example Usage
/// {{% example %}}
///
/// ```csharp
/// using Pulumi;
/// using Aws = Pulumi.Aws;
///
/// class MyStack : Stack
/// {
/// public MyStack()
/// {
/// var example = Output.Create(Aws.ApiGateway.GetDomainName.InvokeAsync(new Aws.ApiGateway.GetDomainNameArgs
/// {
/// DomainName = "api.example.com",
/// }));
/// }
///
/// }
/// ```
/// {{% /example %}}
/// {{% /examples %}}
/// </summary>
public static Task<GetDomainNameResult> InvokeAsync(GetDomainNameArgs args, InvokeOptions? options = null)
=> Pulumi.Deployment.Instance.InvokeAsync<GetDomainNameResult>("aws:apigateway/getDomainName:getDomainName", args ?? new GetDomainNameArgs(), options.WithVersion());
}


public sealed class GetDomainNameArgs : Pulumi.InvokeArgs
{
/// <summary>
/// The fully-qualified domain name to look up. If no domain name is found, an error will be returned.
/// </summary>
[Input("domainName", required: true)]
public string DomainName { get; set; } = null!;

[Input("tags")]
private Dictionary<string, string>? _tags;

/// <summary>
/// Key-value map of tags for the resource.
/// </summary>
public Dictionary<string, string> Tags
{
get => _tags ?? (_tags = new Dictionary<string, string>());
set => _tags = value;
}

public GetDomainNameArgs()
{
}
}


[OutputType]
public sealed class GetDomainNameResult
{
/// <summary>
/// The ARN of the found custom domain name.
/// </summary>
public readonly string Arn;
/// <summary>
/// The ARN for an AWS-managed certificate that is used by edge-optimized endpoint for this domain name.
/// </summary>
public readonly string CertificateArn;
/// <summary>
/// The name of the certificate that is used by edge-optimized endpoint for this domain name.
/// </summary>
public readonly string CertificateName;
/// <summary>
/// The upload date associated with the domain certificate.
/// </summary>
public readonly string CertificateUploadDate;
/// <summary>
/// The hostname created by Cloudfront to represent the distribution that implements this domain name mapping.
/// </summary>
public readonly string CloudfrontDomainName;
/// <summary>
/// For convenience, the hosted zone ID (`Z2FDTNDATAQYW2`) that can be used to create a Route53 alias record for the distribution.
/// </summary>
public readonly string CloudfrontZoneId;
public readonly string DomainName;
/// <summary>
/// List of objects with the endpoint configuration of this domain name.
/// </summary>
public readonly ImmutableArray<Outputs.GetDomainNameEndpointConfigurationResult> EndpointConfigurations;
/// <summary>
/// The provider-assigned unique ID for this managed resource.
/// </summary>
public readonly string Id;
/// <summary>
/// The ARN for an AWS-managed certificate that is used for validating the regional domain name.
/// </summary>
public readonly string RegionalCertificateArn;
/// <summary>
/// The user-friendly name of the certificate that is used by regional endpoint for this domain name.
/// </summary>
public readonly string RegionalCertificateName;
/// <summary>
/// The hostname for the custom domain's regional endpoint.
/// </summary>
public readonly string RegionalDomainName;
/// <summary>
/// The hosted zone ID that can be used to create a Route53 alias record for the regional endpoint.
/// </summary>
public readonly string RegionalZoneId;
/// <summary>
/// The security policy for the domain name.
/// </summary>
public readonly string SecurityPolicy;
/// <summary>
/// Key-value map of tags for the resource.
/// </summary>
public readonly ImmutableDictionary<string, string>? Tags;

[OutputConstructor]
private GetDomainNameResult(
string arn,

string certificateArn,

string certificateName,

string certificateUploadDate,

string cloudfrontDomainName,

string cloudfrontZoneId,

string domainName,

ImmutableArray<Outputs.GetDomainNameEndpointConfigurationResult> endpointConfigurations,

string id,

string regionalCertificateArn,

string regionalCertificateName,

string regionalDomainName,

string regionalZoneId,

string securityPolicy,

ImmutableDictionary<string, string>? tags)
{
Arn = arn;
CertificateArn = certificateArn;
CertificateName = certificateName;
CertificateUploadDate = certificateUploadDate;
CloudfrontDomainName = cloudfrontDomainName;
CloudfrontZoneId = cloudfrontZoneId;
DomainName = domainName;
EndpointConfigurations = endpointConfigurations;
Id = id;
RegionalCertificateArn = regionalCertificateArn;
RegionalCertificateName = regionalCertificateName;
RegionalDomainName = regionalDomainName;
RegionalZoneId = regionalZoneId;
SecurityPolicy = securityPolicy;
Tags = tags;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// *** 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.ApiGateway.Inputs
{

public sealed class DomainNameMutualTlsAuthenticationArgs : Pulumi.ResourceArgs
{
/// <summary>
/// An Amazon S3 URL that specifies the truststore for mutual TLS authentication, for example, `s3://bucket-name/key-name`.
/// The truststore can contain certificates from public or private certificate authorities. To update the truststore, upload a new version to S3, and then update your custom domain name to use the new version.
/// </summary>
[Input("truststoreUri", required: true)]
public Input<string> TruststoreUri { get; set; } = null!;

/// <summary>
/// The version of the S3 object that contains the truststore. To specify a version, you must have versioning enabled for the S3 bucket.
/// </summary>
[Input("truststoreVersion")]
public Input<string>? TruststoreVersion { get; set; }

public DomainNameMutualTlsAuthenticationArgs()
{
}
}
}
Loading

0 comments on commit 1432460

Please sign in to comment.