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.
Nike-Inc · Jan 24, 2019 · ec3fcc7 · ec3fcc7
1 parent f5c1ec9
commit ec3fcc7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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);