Skip to content

Commit

Permalink
Upgrade to v3.9.0 of the AWS Terraform Provider (#1149)
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 authored Oct 7, 2020
1 parent d957a5e commit f0d5bae
Show file tree
Hide file tree
Showing 378 changed files with 48,480 additions and 1,772 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CHANGELOG
=========

## HEAD (Unreleased)
* Upgrade to v3.9.0 of the AWS Terraform Provider
* Upgrade to pulumi-terraform-bridge v2.10.2
* Upgrade to Pulumi v2.10.2

Expand Down
4,373 changes: 4,344 additions & 29 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 @@ -15,5 +15,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-20200910230100-328eb4ff41df
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.20200925100120-f6be38bce723
github.com/terraform-providers/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20201002192817-1621b4b89e1b
)
7 changes: 7 additions & 0 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -773,9 +773,11 @@ github.com/mitchellh/pointerstructure v0.0.0-20190430161007-f252a8fd71c8/go.mod
github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE=
github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
Expand Down Expand Up @@ -980,6 +982,8 @@ github.com/pulumi/terraform-provider-aws v1.38.1-0.20200924135808-374f5da7c8d8 h
github.com/pulumi/terraform-provider-aws v1.38.1-0.20200924135808-374f5da7c8d8/go.mod h1:+k63EbgjEEUKSDVP5kAnAxk6nxfX52+rOiobDXxeRx4=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20200925100120-f6be38bce723 h1:Sd7bWFAcBLuXSOjvUQpC7QYEOdzEVlyc/pCiHgHRFU0=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20200925100120-f6be38bce723/go.mod h1:26tJEW3ZVnXGoZGG7jCJvQMqMIHeCgJIukmeOfVODDI=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20201002192817-1621b4b89e1b h1:vGQGYSxP6ax0wj9kCbL5KY8xkHg207lbmVHsMv0IaOQ=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20201002192817-1621b4b89e1b/go.mod h1:4NIjacQW0H/CxaRA0le+cdpoZduR5scLgAaaZ6sGbqU=
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 Expand Up @@ -1055,6 +1059,7 @@ github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHN
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
Expand Down Expand Up @@ -1104,6 +1109,8 @@ github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok=
github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
github.com/ulikunitz/xz v0.5.7 h1:YvTNdFzX6+W5m9msiYg/zpkSURPPtOlzbqYjrFn7Yt4=
github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
Expand Down
45 changes: 40 additions & 5 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ const (
cloudfrontMod = "CloudFront" // Cloud Front
cloudtrailMod = "CloudTrail" // Cloud Trail
cloudwatchMod = "CloudWatch" // Cloud Watch
codeartifactMod = "CodeArtifact" // CodeArtifact
codebuildMod = "CodeBuild" // Code Build
codecommitMod = "CodeCommit" // Code Commit
codedeployMod = "CodeDeploy" // Code Deploy
Expand Down Expand Up @@ -579,9 +580,10 @@ func Provider() tfbridge.ProviderInfo {
"aws_autoscaling_policy": {Tok: awsResource(autoscalingMod, "Policy")},
"aws_autoscaling_schedule": {Tok: awsResource(autoscalingMod, "Schedule")},
// Backup
"aws_backup_plan": {Tok: awsResource(backupMod, "Plan")},
"aws_backup_selection": {Tok: awsResource(backupMod, "Selection")},
"aws_backup_vault": {Tok: awsResource(backupMod, "Vault")},
"aws_backup_plan": {Tok: awsResource(backupMod, "Plan")},
"aws_backup_selection": {Tok: awsResource(backupMod, "Selection")},
"aws_backup_vault": {Tok: awsResource(backupMod, "Vault")},
"aws_backup_vault_notifications": {Tok: awsResource(backupMod, "VaultNotifications")},
// Batch
"aws_batch_compute_environment": {Tok: awsResource(batchMod, "ComputeEnvironment")},
"aws_batch_job_definition": {Tok: awsResource(batchMod, "JobDefinition")},
Expand Down Expand Up @@ -776,8 +778,8 @@ func Provider() tfbridge.ProviderInfo {
"cloudwatch_log_group_arn": {Type: awsTypeDefaultFile(awsMod, "ARN")},
},
},
"aws_datasync_location_smb": {Tok: awsResource(datasyncMod, "LocationSmb")},
"aws_datasync_location_fsx_windows": {Tok: awsResource(datasyncMod, "LocationFsxWindows")},
"aws_datasync_location_smb": {Tok: awsResource(datasyncMod, "LocationSmb")},
"aws_datasync_location_fsx_windows_file_system": {Tok: awsResource(datasyncMod, "LocationFsxWindows")},
// Data Lifecycle Manager
"aws_dlm_lifecycle_policy": {Tok: awsResource(dlmMod, "LifecyclePolicy")},
// Data Migration Service
Expand Down Expand Up @@ -1319,6 +1321,16 @@ func Provider() tfbridge.ProviderInfo {
"aws_glue_trigger": {Tok: awsResource(glueMod, "Trigger")},
"aws_glue_workflow": {Tok: awsResource(glueMod, "Workflow")},
"aws_glue_user_defined_function": {Tok: awsResource(glueMod, "UserDefinedFunction")},
"aws_glue_data_catalog_encryption_settings": {
Tok: awsResource(glueMod, "DataCatalogEncryptionSettings"),
Fields: map[string]*tfbridge.SchemaInfo{
"data_catalog_encryption_settings": {
CSharpName: "DataCatalogEncryptionSettingsConfig",
},
},
},
"aws_glue_ml_transform": {Tok: awsResource(glueMod, "MLTransform")},
"aws_glue_partition": {Tok: awsResource(glueMod, "Partition")},
// GuardDuty
"aws_guardduty_detector": {Tok: awsResource(guarddutyMod, "Detector")},
"aws_guardduty_invite_accepter": {Tok: awsResource(guarddutyMod, "InviteAccepter")},
Expand Down Expand Up @@ -1808,6 +1820,7 @@ func Provider() tfbridge.ProviderInfo {
},
"aws_db_proxy": {Tok: awsResource(rdsMod, "Proxy")},
"aws_db_proxy_default_target_group": {Tok: awsResource(rdsMod, "ProxyDefaultTargetGroup")},
"aws_db_proxy_target": {Tok: awsResource(rdsMod, "ProxyTarget")},
// RedShift
"aws_redshift_cluster": {Tok: awsResource(redshiftMod, "Cluster")},
"aws_redshift_event_subscription": {Tok: awsResource(redshiftMod, "EventSubscription")},
Expand Down Expand Up @@ -2151,6 +2164,26 @@ func Provider() tfbridge.ProviderInfo {
"aws_codestarnotifications_notification_rule": {Tok: awsResource(codestarNotificiationsMod, "NotificationRule")},
// Lex
"aws_lex_slot_type": {Tok: awsResource(lexMod, "SlotType")},
"aws_lex_bot": {Tok: awsResource(lexMod, "Bot")},
"aws_lex_intent": {Tok: awsResource(lexMod, "Intent")},
// Codeartifact
"aws_codeartifact_domain": {
Tok: awsResource(codeartifactMod, "Domain"),
Fields: map[string]*tfbridge.SchemaInfo{
"domain": {
CSharpName: "DomainName",
},
},
},
"aws_codeartifact_repository": {
Tok: awsResource(codeartifactMod, "Repository"),
Fields: map[string]*tfbridge.SchemaInfo{
"repository": {
CSharpName: "RepositoryName",
},
},
},
"aws_codeartifact_domain_permissions_policy": {Tok: awsResource(codeartifactMod, "DomainPermissions")},
},
DataSources: map[string]*tfbridge.DataSourceInfo{
// AWS
Expand Down Expand Up @@ -2502,6 +2535,8 @@ func Provider() tfbridge.ProviderInfo {
"aws_docdb_orderable_db_instance": {Tok: awsDataSource(docdbMod, "getOrderableDbInstance")},
"aws_docdb_engine_version": {Tok: awsDataSource(docdbMod, "getEngineVersion")},
"aws_lex_slot_type": {Tok: awsDataSource(lexMod, "getSlotType")},
"aws_lex_bot": {Tok: awsDataSource(lexMod, "getBot")},
"aws_lex_intent": {Tok: awsDataSource(lexMod, "getIntent")},
"aws_neptune_orderable_db_instance": {Tok: awsDataSource(neptuneMod, "getOrderableDbInstance")},
"aws_neptune_engine_version": {Tok: awsDataSource(neptuneMod, "getEngineVersion")},
},
Expand Down
12 changes: 12 additions & 0 deletions sdk/dotnet/AppMesh/Inputs/RouteSpecArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ namespace Pulumi.Aws.AppMesh.Inputs

public sealed class RouteSpecArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The gRPC routing information for the route.
/// </summary>
[Input("grpcRoute")]
public Input<Inputs.RouteSpecGrpcRouteArgs>? GrpcRoute { get; set; }

/// <summary>
/// The HTTP/2 routing information for the route.
/// </summary>
[Input("http2Route")]
public Input<Inputs.RouteSpecHttp2RouteArgs>? Http2Route { get; set; }

/// <summary>
/// The HTTP routing information for the route.
/// </summary>
Expand Down
12 changes: 12 additions & 0 deletions sdk/dotnet/AppMesh/Inputs/RouteSpecGetArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ namespace Pulumi.Aws.AppMesh.Inputs

public sealed class RouteSpecGetArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The gRPC routing information for the route.
/// </summary>
[Input("grpcRoute")]
public Input<Inputs.RouteSpecGrpcRouteGetArgs>? GrpcRoute { get; set; }

/// <summary>
/// The HTTP/2 routing information for the route.
/// </summary>
[Input("http2Route")]
public Input<Inputs.RouteSpecHttp2RouteGetArgs>? Http2Route { get; set; }

/// <summary>
/// The HTTP routing information for the route.
/// </summary>
Expand Down
32 changes: 32 additions & 0 deletions sdk/dotnet/AppMesh/Inputs/RouteSpecGrpcRouteActionArgs.cs
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.AppMesh.Inputs
{

public sealed class RouteSpecGrpcRouteActionArgs : Pulumi.ResourceArgs
{
[Input("weightedTargets", required: true)]
private InputList<Inputs.RouteSpecGrpcRouteActionWeightedTargetArgs>? _weightedTargets;

/// <summary>
/// The targets that traffic is routed to when a request matches the route.
/// You can specify one or more targets and their relative weights with which to distribute traffic.
/// </summary>
public InputList<Inputs.RouteSpecGrpcRouteActionWeightedTargetArgs> WeightedTargets
{
get => _weightedTargets ?? (_weightedTargets = new InputList<Inputs.RouteSpecGrpcRouteActionWeightedTargetArgs>());
set => _weightedTargets = value;
}

public RouteSpecGrpcRouteActionArgs()
{
}
}
}
32 changes: 32 additions & 0 deletions sdk/dotnet/AppMesh/Inputs/RouteSpecGrpcRouteActionGetArgs.cs
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.AppMesh.Inputs
{

public sealed class RouteSpecGrpcRouteActionGetArgs : Pulumi.ResourceArgs
{
[Input("weightedTargets", required: true)]
private InputList<Inputs.RouteSpecGrpcRouteActionWeightedTargetGetArgs>? _weightedTargets;

/// <summary>
/// The targets that traffic is routed to when a request matches the route.
/// You can specify one or more targets and their relative weights with which to distribute traffic.
/// </summary>
public InputList<Inputs.RouteSpecGrpcRouteActionWeightedTargetGetArgs> WeightedTargets
{
get => _weightedTargets ?? (_weightedTargets = new InputList<Inputs.RouteSpecGrpcRouteActionWeightedTargetGetArgs>());
set => _weightedTargets = value;
}

public RouteSpecGrpcRouteActionGetArgs()
{
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// *** 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.AppMesh.Inputs
{

public sealed class RouteSpecGrpcRouteActionWeightedTargetArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The virtual node to associate with the weighted target.
/// </summary>
[Input("virtualNode", required: true)]
public Input<string> VirtualNode { get; set; } = null!;

/// <summary>
/// The relative weight of the weighted target. An integer between 0 and 100.
/// </summary>
[Input("weight", required: true)]
public Input<int> Weight { get; set; } = null!;

public RouteSpecGrpcRouteActionWeightedTargetArgs()
{
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// *** 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.AppMesh.Inputs
{

public sealed class RouteSpecGrpcRouteActionWeightedTargetGetArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The virtual node to associate with the weighted target.
/// </summary>
[Input("virtualNode", required: true)]
public Input<string> VirtualNode { get; set; } = null!;

/// <summary>
/// The relative weight of the weighted target. An integer between 0 and 100.
/// </summary>
[Input("weight", required: true)]
public Input<int> Weight { get; set; } = null!;

public RouteSpecGrpcRouteActionWeightedTargetGetArgs()
{
}
}
}
37 changes: 37 additions & 0 deletions sdk/dotnet/AppMesh/Inputs/RouteSpecGrpcRouteArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// *** 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.AppMesh.Inputs
{

public sealed class RouteSpecGrpcRouteArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The action to take if a match is determined.
/// </summary>
[Input("action", required: true)]
public Input<Inputs.RouteSpecGrpcRouteActionArgs> Action { get; set; } = null!;

/// <summary>
/// The criteria for determining an gRPC request match.
/// </summary>
[Input("match", required: true)]
public Input<Inputs.RouteSpecGrpcRouteMatchArgs> Match { get; set; } = null!;

/// <summary>
/// The retry policy.
/// </summary>
[Input("retryPolicy")]
public Input<Inputs.RouteSpecGrpcRouteRetryPolicyArgs>? RetryPolicy { get; set; }

public RouteSpecGrpcRouteArgs()
{
}
}
}
37 changes: 37 additions & 0 deletions sdk/dotnet/AppMesh/Inputs/RouteSpecGrpcRouteGetArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// *** 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.AppMesh.Inputs
{

public sealed class RouteSpecGrpcRouteGetArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The action to take if a match is determined.
/// </summary>
[Input("action", required: true)]
public Input<Inputs.RouteSpecGrpcRouteActionGetArgs> Action { get; set; } = null!;

/// <summary>
/// The criteria for determining an gRPC request match.
/// </summary>
[Input("match", required: true)]
public Input<Inputs.RouteSpecGrpcRouteMatchGetArgs> Match { get; set; } = null!;

/// <summary>
/// The retry policy.
/// </summary>
[Input("retryPolicy")]
public Input<Inputs.RouteSpecGrpcRouteRetryPolicyGetArgs>? RetryPolicy { get; set; }

public RouteSpecGrpcRouteGetArgs()
{
}
}
}
Loading

0 comments on commit f0d5bae

Please sign in to comment.