Fix for tagsProperty in CFN schema creation

This value is expected to be a JSON pointer to a property, not just the name of the property. See: https://github.com/aws-cloudformation/cloudformation-cli/blob/master/src/rpdk/core/data/schema/provider.definition.schema.v1.json#L193-L197
smithy-lang · Nov 7, 2024 · 37e0dec · 37e0dec
1 parent 31f10c5
commit 37e0dec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...c/main/java/software/amazon/smithy/aws/cloudformation/schema/fromsmithy/CfnConverter.java b/...c/main/java/software/amazon/smithy/aws/cloudformation/schema/fromsmithy/CfnConverter.java
@@ -311,7 +311,7 @@ private ResourceSchema convertResource(ConversionEnvironment environment, Resour
             Tagging.Builder tagBuilder = Tagging.builder()
                     .taggable(true)
                     .tagOnCreate(tagsIndex.isResourceTagOnCreate(resourceShape.getId()))
-                    .tagProperty(getTagsProperty(resourceShape))
+                    .tagProperty("/properties/" + getTagMemberName(resourceShape))
                     .cloudFormationSystemTags(!trait.getDisableSystemTags())
                     // Unless tag-on-create is supported, Smithy tagging means
                     .tagUpdatable(true);
@@ -396,7 +396,7 @@ private StructureShape getCfnResourceStructure(Model model, ResourceShape resour
         return builder.build();
     }
 
-    private String getTagsProperty(ResourceShape resource) {
+    private String getTagMemberName(ResourceShape resource) {
         return resource.getTrait(TaggableTrait.class)
                 .flatMap(TaggableTrait::getProperty)
                 .map(property -> {
@@ -414,21 +414,21 @@ private void injectTagsIfNecessary(
         ResourceShape resource,
         CfnResource cfnResource
     ) {
-        String tagPropertyName = getTagsProperty(resource);
+        String tagMemberName = getTagMemberName(resource);
         if (resource.hasTrait(TaggableTrait.class)) {
             AwsTagIndex tagIndex = AwsTagIndex.of(model);
             TaggableTrait trait = resource.expectTrait(TaggableTrait.class);
             if (!trait.getProperty().isPresent() || !cfnResource.getProperties()
                     .containsKey(trait.getProperty().get())) {
                 if (trait.getProperty().isPresent()) {
                     ShapeId definition = resource.getProperties().get(trait.getProperty().get());
-                    builder.addMember(tagPropertyName, definition);
+                    builder.addMember(tagMemberName, definition);
                 } else {
                     // A valid TagResource operation certainly has a single tags input member.
                     AwsTagIndex awsTagIndex = AwsTagIndex.of(model);
                     Optional<ShapeId> tagOperation = tagIndex.getTagResourceOperation(resource.getId());
                     MemberShape member = awsTagIndex.getTagsMember(tagOperation.get()).get();
-                    member = member.toBuilder().id(builder.getId().withMember(tagPropertyName)).build();
+                    member = member.toBuilder().id(builder.getId().withMember(tagMemberName)).build();
                     builder.addMember(member);
                 }
             }

diff --git a/...software/amazon/smithy/aws/cloudformation/schema/fromsmithy/weather-service-wide.cfn.json b/...software/amazon/smithy/aws/cloudformation/schema/fromsmithy/weather-service-wide.cfn.json
@@ -80,7 +80,7 @@
     },
     "tagging": {
         "tagOnCreate": false,
-        "tagProperty": "Tags",
+        "tagProperty": "/properties/Tags",
         "tagUpdatable": true,
         "cloudFormationSystemTags": true,
         "taggable": true

diff --git a/...st/resources/software/amazon/smithy/aws/cloudformation/schema/fromsmithy/weather.cfn.json b/...st/resources/software/amazon/smithy/aws/cloudformation/schema/fromsmithy/weather.cfn.json
@@ -79,7 +79,7 @@
     },
     "tagging": {
         "tagOnCreate": false,
-        "tagProperty": "Tags",
+        "tagProperty": "/properties/Tags",
         "tagUpdatable": true,
         "cloudFormationSystemTags": true,
         "taggable": true