Skip to content

Commit

Permalink
Correctly set the alt type for aws_cloudwatch_log_resource_policy (#…
Browse files Browse the repository at this point in the history
…3743)

This is a breaking change for Go and Typescript if users were reading
the `PolicyDocument` field on LogResourcePolicyArgs or on
LogResourcePolicy. If we don't want to take the change, we can remove
the override entirely (semantically equivalent to what we have now in
master).

This was discovered as part of
pulumi/pulumi-terraform-bridge#1758.
  • Loading branch information
iwahbe committed Mar 28, 2024
1 parent 77b142d commit 60ee1d9
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 33 deletions.
54 changes: 54 additions & 0 deletions provider/cmd/pulumi-resource-aws/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -184553,6 +184553,15 @@
"inputProperties": {
"policyDocument": {
"type": "string",
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"$ref": "#/types/aws:iam/documents:PolicyDocument"
}
],
"description": "Details of the resource policy, including the identity of the principal that is enabled to put logs to this account. This is formatted as a JSON string. Maximum length of 5120 characters.\n"
},
"policyName": {
Expand All @@ -184570,6 +184579,15 @@
"properties": {
"policyDocument": {
"type": "string",
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"$ref": "#/types/aws:iam/documents:PolicyDocument"
}
],
"description": "Details of the resource policy, including the identity of the principal that is enabled to put logs to this account. This is formatted as a JSON string. Maximum length of 5120 characters.\n"
},
"policyName": {
Expand Down Expand Up @@ -229034,6 +229052,15 @@
"inputProperties": {
"policy": {
"type": "string",
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"$ref": "#/types/aws:iam/documents:PolicyDocument"
}
],
"description": "The policy document. This is a JSON formatted string.\n"
}
},
Expand All @@ -229045,6 +229072,15 @@
"properties": {
"policy": {
"type": "string",
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"$ref": "#/types/aws:iam/documents:PolicyDocument"
}
],
"description": "The policy document. This is a JSON formatted string.\n"
},
"registryId": {
Expand Down Expand Up @@ -333122,6 +333158,15 @@
},
"policy": {
"type": "string",
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"$ref": "#/types/aws:iam/documents:PolicyDocument"
}
],
"description": "The fully-formed AWS policy as JSON.\n"
}
},
Expand All @@ -333143,6 +333188,15 @@
},
"policy": {
"type": "string",
"oneOf": [
{
"type": "string"
},
{
"type": "string",
"$ref": "#/types/aws:iam/documents:PolicyDocument"
}
],
"description": "The fully-formed AWS policy as JSON.\n"
}
},
Expand Down
24 changes: 9 additions & 15 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -1335,11 +1335,9 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
Tok: awsResource(cloudwatchMod, "LogResourcePolicy"),
Fields: map[string]*tfbridge.SchemaInfo{
"policy_document": {
Elem: &tfbridge.SchemaInfo{
Type: "string",
AltTypes: []tokens.Type{awsType(iamMod, "documents", "PolicyDocument")},
Transform: tfbridge.TransformJSONDocument,
},
Type: "string",
AltTypes: []tokens.Type{awsType(iamMod, "documents", "PolicyDocument")},
Transform: tfbridge.TransformJSONDocument,
},
},
},
Expand Down Expand Up @@ -2087,11 +2085,9 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
Tok: awsResource(ecrMod, "RegistryPolicy"),
Fields: map[string]*tfbridge.SchemaInfo{
"policy": {
Elem: &tfbridge.SchemaInfo{
Type: "string",
AltTypes: []tokens.Type{awsType(iamMod, "documents", "PolicyDocument")},
Transform: tfbridge.TransformJSONDocument,
},
Type: "string",
AltTypes: []tokens.Type{awsType(iamMod, "documents", "PolicyDocument")},
Transform: tfbridge.TransformJSONDocument,
},
},
},
Expand Down Expand Up @@ -3851,11 +3847,9 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
Tok: awsResource(snsMod, "TopicPolicy"),
Fields: map[string]*tfbridge.SchemaInfo{
"policy": {
Elem: &tfbridge.SchemaInfo{
Type: "string",
AltTypes: []tokens.Type{awsType(iamMod, "documents", "PolicyDocument")},
Transform: tfbridge.TransformJSONDocument,
},
Type: "string",
AltTypes: []tokens.Type{awsType(iamMod, "documents", "PolicyDocument")},
Transform: tfbridge.TransformJSONDocument,
},
},
},
Expand Down
8 changes: 4 additions & 4 deletions sdk/go/aws/cloudwatch/logResourcePolicy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions sdk/go/aws/ecr/registryPolicy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions sdk/go/aws/sns/topicPolicy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions sdk/nodejs/cloudwatch/logResourcePolicy.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions sdk/nodejs/ecr/registryPolicy.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions sdk/nodejs/sns/topicPolicy.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 60ee1d9

Please sign in to comment.