Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug with cloudformation unions #794

Merged
merged 1 commit into from
May 11, 2021
Merged

Fix bug with cloudformation unions #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions ...mazon/smithy/aws/cloudformation/schema/fromsmithy/mappers/AdditionalPropertiesMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@

package software.amazon.smithy.aws.cloudformation.schema.fromsmithy.mappers;

import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import software.amazon.smithy.aws.cloudformation.schema.fromsmithy.CfnMapper;
import software.amazon.smithy.aws.cloudformation.schema.fromsmithy.Context;
import software.amazon.smithy.aws.cloudformation.schema.model.ResourceSchema;
import software.amazon.smithy.model.node.ArrayNode;
import software.amazon.smithy.model.node.Node;
import software.amazon.smithy.model.node.ObjectNode;
import software.amazon.smithy.model.node.StringNode;
Expand Down Expand Up @@ -54,15 +57,31 @@ public ObjectNode updateNode(Context context, ResourceSchema resourceSchema, Obj
if (definitionsOptional.isPresent()) {
for (Map.Entry<StringNode, Node> entry : definitionsOptional.get().getMembers().entrySet()) {
ObjectNode valueNode = entry.getValue().expectObjectNode();

if (valueNode.expectStringMember("type").getValue().equals("object")) {
valueNode = valueNode.withMember("additionalProperties", false);
}

updatedNodes.put(entry.getKey(), valueNode);
updatedNodes.put(entry.getKey(), addAdditionalProperties(valueNode));
}
node = node.withMember("definitions", Node.objectNode(updatedNodes));
}
return node;
}

private Node addAdditionalProperties(Node node) {
if (!node.isObjectNode()) {
return node;
}
ObjectNode valueNode = node.expectObjectNode();

// Unions may be expressed as a "oneOf" which won't have a type.
Optional<String> type = valueNode.getStringMember("type").map(StringNode::getValue);
if (!type.isPresent() && valueNode.getArrayMember("oneOf").isPresent()) {
List<Node> elements = valueNode.expectArrayMember("oneOf").getElements();
List<Node> updatedElements = new ArrayList<>(elements.size());
for (Node element: elements) {
updatedElements.add(addAdditionalProperties(element));
}
valueNode = valueNode.withMember("oneOf", ArrayNode.fromNodes(updatedElements));
} else if (type.isPresent() && type.get().equals("object")) {
valueNode = valueNode.withMember("additionalProperties", false);
}
return valueNode;
}
}
33 changes: 33 additions & 0 deletions ...ware/amazon/smithy/aws/cloudformation/schema/fromsmithy/disable-caps-fooresource.cfn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,36 @@
},
"additionalProperties": false
},
"ConditionalProperty": {
"oneOf": [
{
"type": "object",
"title": "optionOne",
"properties": {
"optionOne": {
"type": "string"
}
},
"required": [
"optionOne"
],
"additionalProperties": false
},
{
"type": "object",
"title": "optionTwo",
"properties": {
"optionTwo": {
"type": "string"
}
},
"required": [
"optionTwo"
],
"additionalProperties": false
}
]
},
"FooMap": {
"type": "object",
"patternProperties": {
Expand All @@ -25,6 +55,9 @@
}
},
"properties": {
"conditionalProperty": {
"$ref": "#/definitions/ConditionalProperty"
},
"fooId": {
"type": "string"
},
Expand Down
33 changes: 33 additions & 0 deletions ...mazon/smithy/aws/cloudformation/schema/fromsmithy/smithy-testservice-fooresource.cfn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,36 @@
},
"additionalProperties": false
},
"ConditionalProperty": {
"oneOf": [
{
"type": "object",
"title": "OptionOne",
"properties": {
"OptionOne": {
"type": "string"
}
},
"required": [
"OptionOne"
],
"additionalProperties": false
},
{
"type": "object",
"title": "OptionTwo",
"properties": {
"OptionTwo": {
"type": "string"
}
},
"required": [
"OptionTwo"
],
"additionalProperties": false
}
]
},
"FooMap": {
"type": "object",
"patternProperties": {
Expand All @@ -25,6 +55,9 @@
}
},
"properties": {
"ConditionalProperty": {
"$ref": "#/definitions/ConditionalProperty"
},
"FooId": {
"type": "string"
},
Expand Down
13 changes: 13 additions & 0 deletions ...resources/software/amazon/smithy/aws/cloudformation/schema/fromsmithy/test-service.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ structure CreateFooRequest {
fooValidCreateReadProperty: String,

fooValidFullyMutableProperty: ComplexProperty,

conditionalProperty: ConditionalProperty,
}

structure CreateFooResponse {
Expand All @@ -62,6 +64,8 @@ structure GetFooResponse {
fooValidCreateReadProperty: String,

fooValidFullyMutableProperty: ComplexProperty,

conditionalProperty: ConditionalProperty,
}

operation UpdateFooOperation {
Expand All @@ -77,6 +81,8 @@ structure UpdateFooRequest {
fooValidWriteProperty: String,

fooValidFullyMutableProperty: ComplexProperty,

conditionalProperty: ConditionalProperty,
}

structure UpdateFooResponse {
Expand All @@ -85,6 +91,8 @@ structure UpdateFooResponse {
fooValidReadProperty: String,

fooValidFullyMutableProperty: ComplexProperty,

conditionalProperty: ConditionalProperty,
}

/// A Bar resource, not that kind of bar though.
Expand Down Expand Up @@ -239,6 +247,11 @@ structure ComplexProperty {
another: String,
}

union ConditionalProperty {
optionOne: String,
optionTwo: String,
}

map FooMap {
key: String,
value: String
Expand Down