- Fixed outstanding typo.

- Removed shade plugin and just pulished jar
- Renamed ResourceModels to ResourceLifecycleSteps
- Published version as 1.0.0
- Bumped to 1.0.4 for cloudformation-rpdk-java-plugin

Author: diwakar

README.md

@@ -19,7 +19,7 @@ sample for now this can be used for injecting credentials using the role based p
  ...
 
  ~/.aws/config
- [profilei cfn-integration]
+ [profile cfn-integration]
  role_arn = arn:aws:iam::<AWS_ACCOUNT_ID>:role/<ROLE_NAME>
  source_profile = cfn-assume-role
 ```

pom.xml

@@ -118,22 +118,6 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>

src/main/java/software/amazon/cloudformation/test/CRUDLifecycleTestBase.java

@@ -70,7 +70,7 @@ public ResourceModelT getModel() {
     @lombok.Getter
     @lombok.EqualsAndHashCode
     @lombok.ToString
-    public final class ResourceModels {
+    public final class ResourceLifecycleSteps {
         private final List<ModelStepExpectation> modelSteps;
         private final String group;
         private final Map<Action, HandlerInvoke<ResourceModelT, CallbackT>> invokers;
@@ -123,11 +123,11 @@ public Builder updateFail(Supplier<ResourceModelT> model) {
                 Action.UPDATE, OperationStatus.FAILED, null, model));
         }
 
-        public ResourceModels delete(ResourceModelT model) {
+        public ResourceLifecycleSteps delete(ResourceModelT model) {
             return delete(() -> model);
         }
 
-        public ResourceModels delete(Supplier<ResourceModelT> model) {
+        public ResourceLifecycleSteps delete(Supplier<ResourceModelT> model) {
             return add(new ModelStepExpectation(
                 Action.DELETE, OperationStatus.SUCCESS, null, model)).build();
         }
@@ -156,20 +156,20 @@ public Builder action(Action action, HandlerInvoke<ResourceModelT, CallbackT> in
             return this;
         }
 
-        public ResourceModels build() {
-            return new ResourceModels(modelSteps, group, invokers);
+        public ResourceLifecycleSteps build() {
+            return new ResourceLifecycleSteps(modelSteps, group, invokers);
         }
     }
 
-    protected abstract List<ResourceModels> testSeed();
+    protected abstract List<ResourceLifecycleSteps> testSeed();
 
     protected abstract Map<Action, HandlerInvoke<ResourceModelT, CallbackT>> handlers();
 
     protected abstract CallbackT context();
 
     @TestFactory
     final List<DynamicTest> CRUD_Tests() {
-        List<DynamicTest> tests_ = Objects.requireNonNull(testSeed()).stream()
+        return Objects.requireNonNull(testSeed()).stream()
             .flatMap(models -> {
                 final Map<Action, HandlerInvoke<ResourceModelT, CallbackT>> handlers = models.getInvokers();
                 final List<ModelStepExpectation> expectations = models.getModelSteps();
@@ -262,7 +262,6 @@ final List<DynamicTest> CRUD_Tests() {
                 }
                 return tests.stream();
             }).collect(Collectors.toList());
-        return tests_;
     }
 
 

src/main/java/software/amazon/cloudformation/test/KMSKeyEnabledServiceIntegrationTestBase.java

@@ -33,13 +33,10 @@
 import software.amazon.cloudformation.proxy.CallChain;
 import software.amazon.cloudformation.proxy.DelayFactory;
 import software.amazon.cloudformation.proxy.ProgressEvent;
-import software.amazon.cloudformation.proxy.ProxyClient;
 import software.amazon.cloudformation.proxy.StdCallbackContext;
 import software.amazon.cloudformation.proxy.delay.Constant;
 
 import java.time.Duration;
-import java.util.Map;
-import java.util.function.Function;
 import java.util.function.Predicate;
 
 /**
@@ -194,7 +191,7 @@ protected String getKmsKeyId() {
     void describeAndEnableKey() {
         //
         // We need to account for KMS propagation delays. So each step stabilizes returns true
-        // when 4 consecutive attempts to describe and check succeeds to reliably converge.
+        // when 6 consecutive attempts to describe and check succeeds to reliably converge.
         //
         final String trackingKeyName = "describeAndEnableKey";
         final DescribeKeyRequest describeKeyRequest = DescribeKeyRequest.builder().keyId(kmsKeyId).build();