Fix a bug in containsRestApiAccountWithCloudWatchRoleArn

muhamadto · muhamadto · commit 4e4a595647b2 · 2023-06-05T03:28:30.000+10:00
could not find `AWS::ApiGateway::Account` because `stringLikeRegexp` was not use to match the CloudWatchRoleArn

Signed-off-by: muhamadto &lt;muhamadto@gmail.com&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,9 +4,7 @@
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
 #     http://www.apache.org/licenses/LICENSE-2.0
-
-#   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-
+#
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -4,9 +4,7 @@
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
 #     http://www.apache.org/licenses/LICENSE-2.0
-
-#   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-
+#
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,17 +1,15 @@
-## Licensed to Muhammad Hamadto
-#
-##   Licensed under the Apache License, Version 2.0 (the "License");
-##   you may not use this file except in compliance with the License.
-##   You may obtain a copy of the License at
-##     http://www.apache.org/licenses/LICENSE-2.0
-#
-##   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
+# Licensed to Muhammad Hamadto
+
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-##   Unless required by applicable law or agreed to in writing, software
-##   distributed under the License is distributed on an "AS IS" BASIS,
-##   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-##   See the License for the specific language governing permissions and
-##   limitations under the License.
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
 
 
 name: Publish package to GitHub Packages
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -6,8 +6,6 @@
 #   You may obtain a copy of the License at
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
-#   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-#
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/LICENSE b/LICENSE
@@ -5,8 +5,6 @@ Licensed to Muhammad Hamadto
   You may obtain a copy of the License at
     http://www.apache.org/licenses/LICENSE-2.0
 
-  See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/mvnw b/mvnw
@@ -7,8 +7,6 @@
 #   You may obtain a copy of the License at
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
-#   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-#
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/pom.xml b/pom.xml
@@ -7,8 +7,6 @@
   ~   You may obtain a copy of the License at
   ~     http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-  ~
   ~   Unless required by applicable law or agreed to in writing, software
   ~   distributed under the License is distributed on an "AS IS" BASIS,
   ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +23,7 @@
   <groupId>cloud.pianola</groupId>
   <artifactId>cdk-fluent-assertions</artifactId>
   <name>CDK Fluent Assertions</name>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <packaging>jar</packaging>
   <description>AssertJ-like fluent assertions for AWS CDK testing</description>
   <url>https://github.com/muhamadto/cdk-fluent-assertions</url>
@@ -183,9 +181,6 @@
         You may obtain a copy of the License at
         https://www.apache.org/licenses/LICENSE-2.0
 
-        See the NOTICE file distributed with this work for additional information regarding
-        copyright ownership.
-
         Unless required by applicable law or agreed to in writing, software
         distributed under the License is distributed on an "AS IS" BASIS,
         WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/CDKStackAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/CDKStackAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -120,7 +118,9 @@ public RestApiAccountAssert containsRestApiAccountWithCloudWatchRoleArn(
 
     final Map<String, Map<String, Object>> properties = Map.of(
         "Properties", Map.of(
-            "CloudWatchRoleArn", Map.of("Fn::GetAtt", List.of(cloudWatchRoleArn, "Arn"))
+            "CloudWatchRoleArn", Map.of(
+                "Fn::GetAtt", List.of(stringLikeRegexp(cloudWatchRoleArn), "Arn")
+            )
         )
     );
 
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/CdkResourceType.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/CdkResourceType.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaEventInvokeConfigAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaEventInvokeConfigAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaPermissionAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/LambdaPermissionAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/PolicyAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/PolicyAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/QueueAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/QueueAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/QueuePolicyAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/QueuePolicyAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAccountAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAccountAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/RestApiAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/RoleAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/RoleAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicSubscriptionAssert.java b/src/main/java/cloud/pianola/cdk/fluent/assertion/TopicSubscriptionAssert.java
@@ -5,9 +5,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   See the NOTICE file distributed with this work for additional information regarding copyright ownership.
- *
+ * 
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@`
`6`	`6`	`# You may obtain a copy of the License at`
`7`	`7`	`# http://www.apache.org/licenses/LICENSE-2.0`
`8`	`8`	`#`
`9`		`-# See the NOTICE file distributed with this work for additional information regarding copyright ownership.`
`10`		`-#`
`11`	`9`	`# Unless required by applicable law or agreed to in writing, software`
`12`	`10`	`# distributed under the License is distributed on an "AS IS" BASIS,`
`13`	`11`	`# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`# You may obtain a copy of the License at`
`8`	`8`	`# http://www.apache.org/licenses/LICENSE-2.0`
`9`	`9`	`#`
`10`		`-# See the NOTICE file distributed with this work for additional information regarding copyright ownership.`
`11`		`-#`
`12`	`10`	`# Unless required by applicable law or agreed to in writing, software`
`13`	`11`	`# distributed under the License is distributed on an "AS IS" BASIS,`
`14`	`12`	`# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.`