fix(permissions): ensure lower case for resource name in fiat_permiss…

…ion and fiat_resource tables (backport #963) (#979) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: armory-abedonik <106548537+armory-abedonik@users.noreply.github.com>
spinnaker · Sep 29, 2022 · 523c5fc · 523c5fc
1 parent d27a99e
commit 523c5fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/fiat-sql/src/main/kotlin/com/netflix/spinnaker/fiat/permissions/SqlPermissionsRepository.kt b/fiat-sql/src/main/kotlin/com/netflix/spinnaker/fiat/permissions/SqlPermissionsRepository.kt
@@ -422,7 +422,7 @@ class SqlPermissionsRepository(
 
             insert.apply {
                 chunk.forEach { resource ->
-                    values(id, resource.type, resource.name)
+                    values(id, resource.type, resource.name.toLowerCase())
                     when (jooq.dialect()) {
                         SQLDialect.POSTGRES ->
                             onConflictDoNothing()
@@ -528,7 +528,7 @@ class SqlPermissionsRepository(
 
                 insert.apply {
                     chunk.forEach {
-                        values(it.type, it.name, bodies[it], hashes[it], now)
+                        values(it.type, it.name.toLowerCase(), bodies[it], hashes[it], now)
                         when (jooq.dialect()) {
                             // https://github.com/jOOQ/jOOQ/issues/5975 means we have to duplicate field names here
                             SQLDialect.POSTGRES ->

diff --git a/...l/src/test/kotlin/com/netflix/spinnaker/fiat/permissions/SqlPermissionsRepositoryTests.kt b/...l/src/test/kotlin/com/netflix/spinnaker/fiat/permissions/SqlPermissionsRepositoryTests.kt
@@ -242,7 +242,7 @@ internal object SqlPermissionsRepositoryTests : JUnit5Minutests {
                     .isEqualTo("""{"name":"account","permissions":{}}""")
                 expectThat(resourceBody(jooq, "testuser", app1.resourceType, app1.name).get())
                     .isEqualTo("""{"name":"app","permissions":{},"details":{}}""")
-                expectThat(resourceBody(jooq, "testuser", serviceAccount1.resourceType, serviceAccount1.name).get())
+                expectThat(resourceBody(jooq, "testuser", serviceAccount1.resourceType, serviceAccount1.name.toLowerCase()).get())
                     .isEqualTo("""{"name":"serviceAccount","memberOf":["role1"]}""")
                 expectThat(resourceBody(jooq, "testuser", role1.resourceType, role1.name).get())
                     .isEqualTo("""{"name":"role1"}""")