Skip to content

Commit

Permalink
Update pulumi-terraform-bridge to HEAD.
Browse files Browse the repository at this point in the history 
This brings in the NodeJS codegen changes, fixes a handful of C#
examples, and adds Python property deprecation.
  • Loading branch information
@pgavlin
pgavlin committed Jun 5, 2020
1 parent b9b96a6 commit 8019f33
Show file tree
Hide file tree
Showing 467 changed files with 4,261 additions and 1,836 deletions.
3,056 changes: 2,679 additions & 377 deletions provider/cmd/pulumi-resource-aws/schema.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
github.com/hashicorp/aws-sdk-go-base v0.4.0
github.com/hashicorp/terraform-plugin-sdk v1.13.1
github.com/mitchellh/go-homedir v1.1.0
github.com/pulumi/pulumi-terraform-bridge/v2 v2.4.0
github.com/pulumi/pulumi/pkg/v2 v2.3.0 // indirect
github.com/pulumi/pulumi/sdk/v2 v2.3.0
github.com/pulumi/pulumi-terraform-bridge/v2 v2.4.1-0.20200604233238-fb4d9d6500fb
github.com/pulumi/pulumi/sdk/v2 v2.3.1-0.20200604215121-e6fb3ef0f824
github.com/pulumi/tf2pulumi v0.8.1-0.20200528170746-c1234defe2b5 // indirect
github.com/terraform-providers/terraform-provider-aws v0.0.0-20191010190908-1261a98537f2
)

Expand Down
14 changes: 8 additions & 6 deletions provider/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,21 +721,23 @@ github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.0.0/go.mod h1:CShKXRvffj8fOwzDfBM8qxEpqfMpLLbEAb6QCtcGeUw=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.4.0 h1:Oy7GlODT+hzXrUh0ynAVsSQrRY+eUW4gly2Sf3jeVPQ=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.4.0/go.mod h1:ZDoAgHnFvKeNsQYr2Y8IrAlv7H1Af/F/m9kj8E6GzRA=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.4.1-0.20200604233238-fb4d9d6500fb h1:pTAFEQ5BRKv26l9dDOH32mFRqBo+MGoHlPujgkQha3o=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.4.1-0.20200604233238-fb4d9d6500fb/go.mod h1:Dsue7X6Jlw7lvpW9r34fpu/2Ms/5okPGairKL78ZPfU=
github.com/pulumi/pulumi/pkg/v2 v2.0.0/go.mod h1:kNG9MBTdKP9AzMgkETumR3fmX9gUYB+HpQL767K6jXc=
github.com/pulumi/pulumi/pkg/v2 v2.2.2-0.20200519081838-f66100ce28b0/go.mod h1:GV88eCIrqfFcBWd5QUdN3qMsR0h+x+iRIBnBhhvB78A=
github.com/pulumi/pulumi/pkg/v2 v2.3.0 h1:ujk+Cv9h+PdC/w15xPN0hCbYkhUaanSMPoGvmviGFsM=
github.com/pulumi/pulumi/pkg/v2 v2.3.0/go.mod h1:O/MWGU3wbUGXPzZzWBiPQUjD8iE2AJnrjq6fsRKSB+s=
github.com/pulumi/pulumi/pkg/v2 v2.3.1-0.20200604215121-e6fb3ef0f824 h1:PDpdqY3odB9gnS/wlrndMgjw0UokrbyhE8B2DPb4ZJQ=
github.com/pulumi/pulumi/pkg/v2 v2.3.1-0.20200604215121-e6fb3ef0f824/go.mod h1:aqo0wBboEEdy+T5EYKUB6YnzbL80VPjgJPwjttuHqT0=
github.com/pulumi/pulumi/sdk/v2 v2.0.0 h1:3VMXbEo3bqeaU+YDt8ufVBLD0WhLYE3tG3t/nIZ3Iac=
github.com/pulumi/pulumi/sdk/v2 v2.0.0/go.mod h1:W7k1UDYerc5o97mHnlHHp5iQZKEby+oQrQefWt+2RF4=
github.com/pulumi/pulumi/sdk/v2 v2.2.2-0.20200519081838-f66100ce28b0/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
github.com/pulumi/pulumi/sdk/v2 v2.3.0 h1:uvRYCmoHILKlyyIbXa5CcLSKKt9n2s8j+GKTffpXQf4=
github.com/pulumi/pulumi/sdk/v2 v2.3.0/go.mod h1:cvivzHVRA5Xu3NSE/obmHzO3L693IJSd5QccQuBOMUE=
github.com/pulumi/pulumi/sdk/v2 v2.3.1-0.20200604215121-e6fb3ef0f824 h1:Yfh3Cf1MSWobmGk39y+xWnjvXSEq5UDd4gXanE6+L/o=
github.com/pulumi/pulumi/sdk/v2 v2.3.1-0.20200604215121-e6fb3ef0f824/go.mod h1:llk6tmXss8kJrt3vEXAkwiwgZOuINEFmKIfMveVIwO8=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20200605145502-fb12b583285e h1:/eudWXVSyifRKaTFdI/dk4rTJvVy1nKfVQz5JvIqbW4=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20200605145502-fb12b583285e/go.mod h1:qu2Yl7WdzjH6gyX9SrG8vuSgqNlNRlP7hmCPXnPvFRc=
github.com/pulumi/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d h1:1JtzB9Gx0YX2UgKKkqJwTgBXxfg2cbLUEqTJKwKBK7s=
github.com/pulumi/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d/go.mod h1:yv9XozKsue9ZELHQbrBGgIaFtE3OX3Q4m7koTzTqgpE=
github.com/pulumi/tf2pulumi v0.8.1-0.20200528170746-c1234defe2b5 h1:h+pUwgEser1Ole6TMCc66njRPcw7SEVXpeoClG+ihEM=
github.com/pulumi/tf2pulumi v0.8.1-0.20200528170746-c1234defe2b5/go.mod h1:WuOTC7l/5TV0+/v8Djbgz/zPxqwiCYCxf9zoffDFGuM=
github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
Expand Down
45 changes: 20 additions & 25 deletions provider/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,6 @@ func awsType(mod string, fn string, typ string) tokens.Type {
return tokens.Type(awsMember(mod, fn, typ))
}

// awsTypeNoFile manufactures a type token for the AWS package and the given module and type. It does not append any
// file name to the module.
func awsTypeNoFile(mod string, typ string) tokens.Type {
return tokens.Type(awsMember(mod, "", typ))
}

// awsResource manufactures a standard resource token given a module and resource name. It automatically uses the AWS
// package and names the file by simply lower casing the type's first character.
func awsTypeDefaultFile(mod string, typ string) tokens.Type {
Expand Down Expand Up @@ -263,7 +257,7 @@ func Provider() tfbridge.ProviderInfo {
Version: version.Version,
Config: map[string]*tfbridge.SchemaInfo{
"region": {
Type: awsTypeNoFile("region", "Region"),
Type: awsTypeDefaultFile(awsMod, "Region"),
Default: &tfbridge.DefaultInfo{
EnvVars: []string{"AWS_REGION", "AWS_DEFAULT_REGION"},
},
Expand Down Expand Up @@ -756,22 +750,22 @@ func Provider() tfbridge.ProviderInfo {
"aws_datasync_location_efs": {
Tok: awsResource(datasyncMod, "EfsLocation"),
Fields: map[string]*tfbridge.SchemaInfo{
"efs_file_system_arn": {Type: awsTypeNoFile(awsMod, "ARN")},
"efs_file_system_arn": {Type: awsTypeDefaultFile(awsMod, "ARN")},
},
},
"aws_datasync_location_nfs": {Tok: awsResource(datasyncMod, "NfsLocation")},
"aws_datasync_location_s3": {
Tok: awsResource(datasyncMod, "S3Location"),
Fields: map[string]*tfbridge.SchemaInfo{
"s3_bucket_arn": {Type: awsTypeNoFile(awsMod, "ARN")},
"s3_bucket_arn": {Type: awsTypeDefaultFile(awsMod, "ARN")},
},
},
"aws_datasync_task": {
Tok: awsResource(datasyncMod, "Task"),
Fields: map[string]*tfbridge.SchemaInfo{
"destination_location_arn": {Type: awsTypeNoFile(awsMod, "ARN")},
"source_location_arn": {Type: awsTypeNoFile(awsMod, "ARN")},
"cloudwatch_log_group_arn": {Type: awsTypeNoFile(awsMod, "ARN")},
"destination_location_arn": {Type: awsTypeDefaultFile(awsMod, "ARN")},
"source_location_arn": {Type: awsTypeDefaultFile(awsMod, "ARN")},
"cloudwatch_log_group_arn": {Type: awsTypeDefaultFile(awsMod, "ARN")},
},
},
"aws_datasync_location_smb": {Tok: awsResource(datasyncMod, "LocationSmb")},
Expand Down Expand Up @@ -944,7 +938,7 @@ func Provider() tfbridge.ProviderInfo {
Fields: map[string]*tfbridge.SchemaInfo{
"iam_instance_profile": {
Type: "string",
AltTypes: []tokens.Type{awsTypeNoFile(iamMod, "InstanceProfile")},
AltTypes: []tokens.Type{awsTypeDefaultFile(iamMod, "InstanceProfile")},
},
"instance_type": {
Type: awsTypeDefaultFile(ec2Mod, "InstanceType"),
Expand All @@ -971,7 +965,7 @@ func Provider() tfbridge.ProviderInfo {
Fields: map[string]*tfbridge.SchemaInfo{
"iam_instance_profile": {
Type: "string",
AltTypes: []tokens.Type{awsTypeNoFile(iamMod, "InstanceProfile")},
AltTypes: []tokens.Type{awsTypeDefaultFile(iamMod, "InstanceProfile")},
},
},
},
Expand Down Expand Up @@ -1111,7 +1105,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_ec2_transit_gateway": {
Tok: awsResource(ec2TransitGatewayMod, "TransitGateway"),
Fields: map[string]*tfbridge.SchemaInfo{
"arn": {Type: awsTypeNoFile(awsMod, "ARN")},
"arn": {Type: awsTypeDefaultFile(awsMod, "ARN")},
},
},
"aws_ec2_transit_gateway_route": {
Expand Down Expand Up @@ -1346,7 +1340,7 @@ func Provider() tfbridge.ProviderInfo {
},
"policy_arn": {
Name: "policyArn",
Type: awsTypeNoFile(awsMod, "ARN"),
Type: awsTypeDefaultFile(awsMod, "ARN"),
},
},
// We pass delete-before-replace: this is a leaf node and a create followed by a delete actually
Expand Down Expand Up @@ -1403,7 +1397,7 @@ func Provider() tfbridge.ProviderInfo {
},
"policy_arn": {
Name: "policyArn",
Type: awsTypeNoFile(awsMod, "ARN"),
Type: awsTypeDefaultFile(awsMod, "ARN"),
},
},
// We pass delete-before-replace: this is a leaf node and a create followed by a delete actually
Expand All @@ -1419,7 +1413,7 @@ func Provider() tfbridge.ProviderInfo {
},
"policy_arn": {
Name: "policyArn",
Type: awsTypeNoFile(awsMod, "ARN"),
Type: awsTypeDefaultFile(awsMod, "ARN"),
},
},
// We pass delete-before-replace: this is a leaf node and a create followed by a delete actually
Expand Down Expand Up @@ -1464,7 +1458,7 @@ func Provider() tfbridge.ProviderInfo {
},
"policy_arn": {
Name: "policyArn",
Type: awsTypeNoFile(awsMod, "ARN"),
Type: awsTypeDefaultFile(awsMod, "ARN"),
},
},
// We pass delete-before-replace: this is a leaf node and a create followed by a delete actually
Expand Down Expand Up @@ -1504,10 +1498,10 @@ func Provider() tfbridge.ProviderInfo {
Fields: map[string]*tfbridge.SchemaInfo{
"policy": {
Type: "string",
AltTypes: []tokens.Type{awsTypeNoFile(iotMod, "Policy")},
AltTypes: []tokens.Type{awsTypeDefaultFile(iotMod, "Policy")},
},
"target": {
Type: awsTypeNoFile(awsMod, "ARN"),
Type: awsTypeDefaultFile(awsMod, "ARN"),
},
},
},
Expand All @@ -1517,7 +1511,7 @@ func Provider() tfbridge.ProviderInfo {
Tok: awsResource(iotMod, "ThingPrincipalAttachment"),
Fields: map[string]*tfbridge.SchemaInfo{
"principal": {
Type: awsTypeNoFile(awsMod, "ARN"),
Type: awsTypeDefaultFile(awsMod, "ARN"),
},
},
},
Expand Down Expand Up @@ -1550,7 +1544,7 @@ func Provider() tfbridge.ProviderInfo {
Tok: awsResource(kinesisMod, "AnalyticsApplication"),
Fields: map[string]*tfbridge.SchemaInfo{
"arn": {
Type: awsTypeNoFile(awsMod, "ARN"),
Type: awsTypeDefaultFile(awsMod, "ARN"),
},
},
},
Expand All @@ -1566,7 +1560,7 @@ func Provider() tfbridge.ProviderInfo {
IDFields: []string{"function_name"},
Fields: map[string]*tfbridge.SchemaInfo{
"function_name": tfbridge.AutoName("name", 64),
"role": {Type: awsTypeNoFile(awsMod, "ARN")},
"role": {Type: awsTypeDefaultFile(awsMod, "ARN")},
// Terraform accepts two sources for lambdas: a local filename or a S3 bucket/object. To bridge
// with Pulumi's asset model, we will hijack the filename property. A Pulumi archive is passed in
// its stead and we will turn around and emit the archive as a temp file that Terraform can read.
Expand Down Expand Up @@ -2027,7 +2021,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_sns_topic": {
Tok: awsResource(snsMod, "Topic"),
Fields: map[string]*tfbridge.SchemaInfo{
"arn": {Type: awsTypeNoFile(awsMod, "ARN")},
"arn": {Type: awsTypeDefaultFile(awsMod, "ARN")},
},
},
"aws_sns_topic_policy": {Tok: awsResource(snsMod, "TopicPolicy")},
Expand Down Expand Up @@ -2554,6 +2548,7 @@ func Provider() tfbridge.ProviderInfo {
"serverless": {
DestFiles: []string{
"function.ts", // a union type and constants for available Lambda runtimes.
"index.ts",
},
},
"sns": {
Expand Down
10 changes: 5 additions & 5 deletions sdk/dotnet/Alb/Listener.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace Pulumi.Aws.Alb
/// },
/// },
/// LoadBalancerArn = frontEndLoadBalancer.Arn,
/// Port = "443",
/// Port = 443,
/// Protocol = "HTTPS",
/// SslPolicy = "ELBSecurityPolicy-2016-08",
/// });
Expand Down Expand Up @@ -82,7 +82,7 @@ namespace Pulumi.Aws.Alb
/// },
/// },
/// LoadBalancerArn = frontEndLoadBalancer.Arn,
/// Port = "80",
/// Port = 80,
/// Protocol = "HTTP",
/// });
/// }
Expand Down Expand Up @@ -119,7 +119,7 @@ namespace Pulumi.Aws.Alb
/// },
/// },
/// LoadBalancerArn = frontEndLoadBalancer.Arn,
/// Port = "80",
/// Port = 80,
/// Protocol = "HTTP",
/// });
/// }
Expand Down Expand Up @@ -173,7 +173,7 @@ namespace Pulumi.Aws.Alb
/// },
/// },
/// LoadBalancerArn = frontEndLoadBalancer.Arn,
/// Port = "80",
/// Port = 80,
/// Protocol = "HTTP",
/// });
/// }
Expand Down Expand Up @@ -221,7 +221,7 @@ namespace Pulumi.Aws.Alb
/// },
/// },
/// LoadBalancerArn = frontEndLoadBalancer.Arn,
/// Port = "80",
/// Port = 80,
/// Protocol = "HTTP",
/// });
/// }
Expand Down
10 changes: 5 additions & 5 deletions sdk/dotnet/ApplicationLoadBalancing/Listener.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace Pulumi.Aws.ApplicationLoadBalancing
/// },
/// },
/// LoadBalancerArn = frontEndLoadBalancer.Arn,
/// Port = "443",
/// Port = 443,
/// Protocol = "HTTPS",
/// SslPolicy = "ELBSecurityPolicy-2016-08",
/// });
Expand Down Expand Up @@ -82,7 +82,7 @@ namespace Pulumi.Aws.ApplicationLoadBalancing
/// },
/// },
/// LoadBalancerArn = frontEndLoadBalancer.Arn,
/// Port = "80",
/// Port = 80,
/// Protocol = "HTTP",
/// });
/// }
Expand Down Expand Up @@ -119,7 +119,7 @@ namespace Pulumi.Aws.ApplicationLoadBalancing
/// },
/// },
/// LoadBalancerArn = frontEndLoadBalancer.Arn,
/// Port = "80",
/// Port = 80,
/// Protocol = "HTTP",
/// });
/// }
Expand Down Expand Up @@ -173,7 +173,7 @@ namespace Pulumi.Aws.ApplicationLoadBalancing
/// },
/// },
/// LoadBalancerArn = frontEndLoadBalancer.Arn,
/// Port = "80",
/// Port = 80,
/// Protocol = "HTTP",
/// });
/// }
Expand Down Expand Up @@ -221,7 +221,7 @@ namespace Pulumi.Aws.ApplicationLoadBalancing
/// },
/// },
/// LoadBalancerArn = frontEndLoadBalancer.Arn,
/// Port = "80",
/// Port = 80,
/// Protocol = "HTTP",
/// });
/// }
Expand Down
Loading

0 comments on commit 8019f33

Please sign in to comment.