fix: Trim whitespace when restoring data that is potentially created … (

#184) * fix: Trim whitespace when restoring data that is potentially created from before we removed whitespace from the db via an upgrade script, and add another upgrade script to remove any whitespace that snuck in. * Update gradle.properties
Nike-Inc · Jan 25, 2019 · 5da3959 · 5da3959
1 parent f5c1ec9
commit 5da3959
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
-version=3.25.2
+version=3.25.3
 groupId=com.nike.cerberus
 artifactId=cms
diff --git a/src/main/java/com/nike/cerberus/service/MetadataService.java b/src/main/java/com/nike/cerberus/service/MetadataService.java
@@ -108,7 +108,7 @@ private Set<IamPrincipalPermission> getIamPrincipalPermissionSet(SDBMetadata sdb
         sdbMetadata.getIamRolePermissions().forEach((iamPrincipalArn, roleName) -> {
 
             iamPrincipalPermissionSet.add(new IamPrincipalPermission()
-                    .withIamPrincipalArn(iamPrincipalArn)
+                    .withIamPrincipalArn(iamPrincipalArn.trim())
                     .withRoleId(getRoleIdFromName(roleName))
             );
         });

diff --git a/...cerberus/migration/V1.6.4.0__remove_trailing_whitespace_from_iam_principal_arns_again.sql b/...cerberus/migration/V1.6.4.0__remove_trailing_whitespace_from_iam_principal_arns_again.sql
@@ -0,0 +1 @@
+UPDATE AWS_IAM_ROLE set AWS_IAM_ROLE_ARN = TRIM(AWS_IAM_ROLE_ARN);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		UPDATE AWS_IAM_ROLE set AWS_IAM_ROLE_ARN = TRIM(AWS_IAM_ROLE_ARN);