Polish some log wordings and descriptions

aws-cloudformation-stackset/aws-cloudformation-stackset.json

@@ -1,6 +1,6 @@
 {
  "typeName": "AWS::CloudFormation::StackSet",
- "description": "Resource Type definition for AWS::CloudFormation::StackSet",
+ "description": "StackSet as a resource provides one-click experience for provisioning a StackSet and StackInstances",
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudformation.git",
  "resourceLink": {
  "templateUri": "/cloudformation/home?region=${awsRegion}#/stacksets/${StackSetId}",

aws-cloudformation-stackset/docs/README.md

@@ -1,6 +1,6 @@
 # AWS::CloudFormation::StackSet
 
-Resource Type definition for AWS::CloudFormation::StackSet
+StackSet as a resource provides one-click experience for provisioning a StackSet and StackInstances
 
 ## Syntax
 

aws-cloudformation-stackset/src/main/java/software/amazon/cloudformation/stackset/BaseHandlerStd.java

@@ -76,7 +76,7 @@ protected static boolean isStackSetOperationDone(
 
  switch (status) {
  case SUCCEEDED:
- logger.log(String.format("%s has been successfully stabilized.", operationId));
+ logger.log(String.format("StackSet Operation [%s] has been successfully stabilized.", operationId));
  return true;
  case RUNNING:
  case QUEUED:

aws-cloudformation-stackset/src/main/java/software/amazon/cloudformation/stackset/DeleteHandler.java

@@ -57,7 +57,7 @@ protected ProgressEvent<ResourceModel, CallbackContext> deleteStackSet(
  .makeServiceCall((modelRequest, proxyInvocation) -> {
  final DeleteStackSetResponse response = proxyInvocation.injectCredentialsAndInvokeV2(
  deleteStackSetRequest(model.getStackSetId()), proxyInvocation.client()::deleteStackSet);
- logger.log(String.format("%s successfully deleted.", ResourceModel.TYPE_NAME));
+ logger.log(String.format("%s [%s] has been deleted successfully.", ResourceModel.TYPE_NAME, model.getStackSetId()));
  return response;
  })
  .success();

aws-cloudformation-stackset/src/main/java/software/amazon/cloudformation/stackset/translator/PropertyTranslator.java

@@ -63,7 +63,7 @@ static DeploymentTargets translateToSdkDeploymentTargets(
  }
 
  /**
- * Converts resource model Parameters to StackSet SDK Parameters
+ * Converts StackSet SDK Parameters to resource model Parameters
  *
  * @param parameters Parameters collection from resource model
  * @return SDK Parameter list

aws-cloudformation-stackset/src/main/java/software/amazon/cloudformation/stackset/translator/RequestTranslator.java

@@ -24,7 +24,7 @@
 
 public class RequestTranslator {
 
- private static int LIST_MAX_ITEMS = 100;
+ private static final int LIST_MAX_ITEMS = 100;
 
  public static CreateStackSetRequest createStackSetRequest(
  final ResourceModel model, final String requestToken) {

aws-cloudformation-stackset/src/main/java/software/amazon/cloudformation/stackset/util/Validator.java

@@ -21,7 +21,8 @@ private static void validateResource(final String type) {
  switch (type) {
  case "AWS::CloudFormation::Stack":
  case "AWS::CloudFormation::StackSet":
- throw new CfnInvalidRequestException(String.format("Nested %s is not allowed", type));
+ throw new CfnInvalidRequestException(
+ String.format("Nested %s is not supported in AWS::CloudFormation::StackSet", type));
  }
  }
 
@@ -33,7 +34,7 @@ private static void validateResource(final String type) {
  * <li> Template contents must be valid
  * </ul>
  *
- * @param proxyClient {@link ProxyClient < CloudFormationClient >}
+ * @param proxyClient {@link ProxyClient <CloudFormationClient>}
  * @param templateBody {@link software.amazon.cloudformation.stackset.ResourceModel#getTemplateBody}
  * @param templateLocation {@link software.amazon.cloudformation.stackset.ResourceModel#getTemplateURL}
  * @throws CfnInvalidRequestException if template is not valid
@@ -46,6 +47,7 @@ public void validateTemplate(
  final GetTemplateSummaryResponse response = proxyClient.injectCredentialsAndInvokeV2(
  getTemplateSummaryRequest(templateBody, templateLocation),
  proxyClient.client()::getTemplateSummary);
+
  if (response.hasResourceTypes()) {
  response.resourceTypes().forEach(Validator::validateResource);
  }

aws-cloudformation-stackset/src/test/java/software/amazon/cloudformation/stackset/CreateHandlerTest.java

@@ -38,7 +38,6 @@
 import static software.amazon.cloudformation.stackset.util.TestUtils.DESCRIBE_STACK_INSTANCE_RESPONSE_2;
 import static software.amazon.cloudformation.stackset.util.TestUtils.DESCRIBE_STACK_INSTANCE_RESPONSE_3;
 import static software.amazon.cloudformation.stackset.util.TestUtils.DESCRIBE_STACK_INSTANCE_RESPONSE_4;
-import static software.amazon.cloudformation.stackset.util.TestUtils.INVALID_TEMPLATE_SUMMARY_RESPONSE;
 import static software.amazon.cloudformation.stackset.util.TestUtils.LIST_SELF_MANAGED_STACK_SET_EMPTY_RESPONSE;
 import static software.amazon.cloudformation.stackset.util.TestUtils.LIST_SELF_MANAGED_STACK_SET_ONE_INSTANCES_RESPONSE;
 import static software.amazon.cloudformation.stackset.util.TestUtils.LIST_SELF_MANAGED_STACK_SET_RESPONSE;
@@ -57,6 +56,7 @@
 import static software.amazon.cloudformation.stackset.util.TestUtils.SELF_MANAGED_ONE_INSTANCES_MODEL;
 import static software.amazon.cloudformation.stackset.util.TestUtils.SERVICE_MANAGED_MODEL;
 import static software.amazon.cloudformation.stackset.util.TestUtils.SERVICE_MANAGED_MODEL_FOR_READ;
+import static software.amazon.cloudformation.stackset.util.TestUtils.TEMPLATE_SUMMARY_RESPONSE_WITH_NESTED_STACK;
 import static software.amazon.cloudformation.stackset.util.TestUtils.VALID_TEMPLATE_SUMMARY_RESPONSE;
 
 @ExtendWith(MockitoExtension.class)
@@ -294,7 +294,7 @@ public void handlerRequest_CfnInvalidRequestException_NestedStack() {
  .build();
 
  when(proxyClient.client().getTemplateSummary(any(GetTemplateSummaryRequest.class)))
- .thenReturn(INVALID_TEMPLATE_SUMMARY_RESPONSE);
+ .thenReturn(TEMPLATE_SUMMARY_RESPONSE_WITH_NESTED_STACK);
 
  assertThrows(CfnInvalidRequestException.class,
  () -> handler.handleRequest(proxy, request, new CallbackContext(), proxyClient, logger));

aws-cloudformation-stackset/src/test/java/software/amazon/cloudformation/stackset/util/TestUtils.java

@@ -219,9 +219,10 @@ public class TestUtils {
  .resourceTypes(Arrays.asList("AWS::CloudFormation::WaitCondition"))
  .build();
 
- public final static GetTemplateSummaryResponse INVALID_TEMPLATE_SUMMARY_RESPONSE = GetTemplateSummaryResponse.builder()
- .resourceTypes(Arrays.asList("AWS::CloudFormation::Stack"))
- .build();
+ public final static GetTemplateSummaryResponse TEMPLATE_SUMMARY_RESPONSE_WITH_NESTED_STACK =
+ GetTemplateSummaryResponse.builder()
+ .resourceTypes(Arrays.asList("AWS::CloudFormation::Stack"))
+ .build();
 
  public final static StackInstanceSummary STACK_INSTANCE_SUMMARY_1 = StackInstanceSummary.builder()
  .organizationalUnitId(ORGANIZATION_UNIT_ID_1)