Attempt to cache postgres docker image

hwslabs · Apr 13, 2024 · a78792a · a78792a
1 parent 571e1ee
commit a78792a
Show file tree

Hide file tree

Showing 10 changed files with 101 additions and 266 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,11 +11,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
+
+      - id: image-cache
+        uses: actions/cache@v4
+        with:
+          path: image-cache
+          key: image-cache-${{ runner.os }}
+      - if: steps.image-cache.outputs.cache-hit != 'true'
+        run: |
+          echo "Cache miss!"
+          docker pull postgres:14.1-alpine
+          docker save -o ~/image-cache/postgres.tar postgres:14.1-alpine
+      - if: steps.image-cache.outputs.cache-hit == 'true'
+        run: |
+          echo "Cache hit!"
+          docker load -i ~/image-cache/postgres.tar
+
       - name: Run Postgres
         run: |
           docker-compose -f docker-compose.yml up -d pg

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     env_file:
       - ./docker/iam-web/dev.env
   pg:
-    image: postgres:14.1
+    image: postgres:14.1-alpine
     ports:
       - "4921:5432"
     environment:

diff --git a/src/test/kotlin/com/hypto/iam/server/apis/ActionApiTest.kt b/src/test/kotlin/com/hypto/iam/server/apis/ActionApiTest.kt
@@ -2,10 +2,10 @@ package com.hypto.iam.server.apis
 
 import com.hypto.iam.server.Constants
 import com.hypto.iam.server.helpers.BaseSingleAppTest
-import com.hypto.iam.server.helpers.DataSetupHelper.deleteOrganization
 import com.hypto.iam.server.helpers.DataSetupHelperV3.createAction
 import com.hypto.iam.server.helpers.DataSetupHelperV3.createOrganization
 import com.hypto.iam.server.helpers.DataSetupHelperV3.createResource
+import com.hypto.iam.server.helpers.DataSetupHelperV3.deleteOrganization
 import com.hypto.iam.server.models.Action
 import com.hypto.iam.server.models.ActionPaginatedResponse
 import com.hypto.iam.server.models.BaseSuccessResponse
@@ -55,7 +55,7 @@ class ActionApiTest : BaseSingleAppTest() {
             assertEquals(organization.id, responseBody.organizationId)
             assertEquals("", responseBody.description)
 
-            deleteOrganization(organization.id)
+            testApp.deleteOrganization(organization.id)
         }
     }
 
@@ -85,7 +85,7 @@ class ActionApiTest : BaseSingleAppTest() {
             assertEquals(organization.id, responseBody.organizationId)
             assertEquals(resource.name, responseBody.resourceName)
 
-            deleteOrganization(organization.id)
+            testApp.deleteOrganization(organization.id)
         }
     }
 
@@ -114,8 +114,8 @@ class ActionApiTest : BaseSingleAppTest() {
                 response.contentType(),
             )
 
-            deleteOrganization(organization1.id)
-            deleteOrganization(organization2.id)
+            testApp.deleteOrganization(organization1.id)
+            testApp.deleteOrganization(organization2.id)
         }
     }
 
@@ -147,7 +147,7 @@ class ActionApiTest : BaseSingleAppTest() {
                 }
             assertEquals(HttpStatusCode.NotFound, response.status)
 
-            deleteOrganization(organization.id)
+            testApp.deleteOrganization(organization.id)
         }
     }
 
@@ -177,7 +177,7 @@ class ActionApiTest : BaseSingleAppTest() {
             assert(responseBody.data!!.contains(action1))
             assert(responseBody.data!!.contains(action2))
 
-            deleteOrganization(organization.id)
+            testApp.deleteOrganization(organization.id)
         }
     }
 
@@ -209,7 +209,7 @@ class ActionApiTest : BaseSingleAppTest() {
             assertEquals(resource.name, responseBody.resourceName)
             assertEquals(newDescription, responseBody.description)
 
-            deleteOrganization(organization.id)
+            testApp.deleteOrganization(organization.id)
         }
     }
 }
diff --git a/src/test/kotlin/com/hypto/iam/server/apis/CredentialApiKtTest.kt b/src/test/kotlin/com/hypto/iam/server/apis/CredentialApiKtTest.kt
@@ -2,9 +2,9 @@ package com.hypto.iam.server.apis
 
 import com.hypto.iam.server.Constants
 import com.hypto.iam.server.helpers.BaseSingleAppTest
-import com.hypto.iam.server.helpers.DataSetupHelper.deleteOrganization
 import com.hypto.iam.server.helpers.DataSetupHelperV3.createCredential
 import com.hypto.iam.server.helpers.DataSetupHelperV3.createOrganization
+import com.hypto.iam.server.helpers.DataSetupHelperV3.deleteOrganization
 import com.hypto.iam.server.models.CreateCredentialRequest
 import com.hypto.iam.server.models.Credential
 import com.hypto.iam.server.models.ListCredentialResponse
@@ -66,7 +66,7 @@ internal class CredentialApiKtTest : BaseSingleAppTest() {
                 Assertions.assertEquals(Credential.Status.active, responseBody.status)
                 Assertions.assertNotNull(responseBody.secret)
 
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
 
@@ -105,7 +105,7 @@ internal class CredentialApiKtTest : BaseSingleAppTest() {
                 Assertions.assertEquals(Credential.Status.active, responseBody.status)
                 Assertions.assertNotNull(responseBody.secret)
 
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
 
@@ -134,7 +134,7 @@ internal class CredentialApiKtTest : BaseSingleAppTest() {
                     Json,
                     response.contentType(),
                 )
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
 
@@ -171,7 +171,7 @@ internal class CredentialApiKtTest : BaseSingleAppTest() {
                     Json,
                     response.contentType(),
                 )
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
     }
@@ -233,7 +233,7 @@ internal class CredentialApiKtTest : BaseSingleAppTest() {
                     }
                 Assertions.assertEquals(HttpStatusCode.Unauthorized, response.status)
 
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
 
@@ -258,7 +258,7 @@ internal class CredentialApiKtTest : BaseSingleAppTest() {
                 Assertions.assertEquals(HttpStatusCode.NotFound, response.status)
                 Assertions.assertEquals(Json, response.contentType())
 
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
 
@@ -285,8 +285,8 @@ internal class CredentialApiKtTest : BaseSingleAppTest() {
                     }
                 Assertions.assertEquals(HttpStatusCode.Forbidden, response.status)
                 Assertions.assertEquals(Json, response.contentType())
-                deleteOrganization(organization1.id)
-                deleteOrganization(organizationResponse2.organization.id)
+                testApp.deleteOrganization(organization1.id)
+                testApp.deleteOrganization(organizationResponse2.organization.id)
             }
         }
     }
@@ -319,7 +319,7 @@ internal class CredentialApiKtTest : BaseSingleAppTest() {
                 Assertions.assertNull(responseBody.secret)
                 Assertions.assertEquals(Credential.Status.active, responseBody.status)
 
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
 
@@ -342,7 +342,7 @@ internal class CredentialApiKtTest : BaseSingleAppTest() {
                 Assertions.assertEquals(HttpStatusCode.NotFound, response.status)
                 Assertions.assertEquals(Json, response.contentType())
 
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
 
@@ -363,7 +363,7 @@ internal class CredentialApiKtTest : BaseSingleAppTest() {
                     }
                 Assertions.assertEquals(HttpStatusCode.BadRequest, response.status)
                 Assertions.assertEquals(Json, response.contentType())
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
     }

diff --git a/src/test/kotlin/com/hypto/iam/server/apis/KeyApiTest.kt b/src/test/kotlin/com/hypto/iam/server/apis/KeyApiTest.kt
@@ -2,6 +2,7 @@ package com.hypto.iam.server.apis
 
 import com.hypto.iam.server.helpers.BaseSingleAppTest
 import com.hypto.iam.server.helpers.DataSetupHelperV3.createOrganization
+import com.hypto.iam.server.helpers.DataSetupHelperV3.deleteOrganization
 import com.hypto.iam.server.models.KeyResponse
 import com.hypto.iam.server.models.TokenResponse
 import com.hypto.iam.server.service.TokenServiceImpl
@@ -70,6 +71,8 @@ class KeyApiTest : BaseSingleAppTest() {
             assertDoesNotThrow {
                 Jwts.parserBuilder().setSigningKey(publicKey).build().parseClaimsJws(token)
             }
+
+            testApp.deleteOrganization(organizationResponse.organization.id)
         }
     }
 }
diff --git a/src/test/kotlin/com/hypto/iam/server/apis/OrganizationApiKtTest.kt b/src/test/kotlin/com/hypto/iam/server/apis/OrganizationApiKtTest.kt
@@ -9,7 +9,7 @@ import com.hypto.iam.server.db.repositories.PasscodeRepo
 import com.hypto.iam.server.db.tables.pojos.Organizations
 import com.hypto.iam.server.db.tables.records.PasscodesRecord
 import com.hypto.iam.server.helpers.BaseSingleAppTest
-import com.hypto.iam.server.helpers.DataSetupHelper.deleteOrganization
+import com.hypto.iam.server.helpers.DataSetupHelperV3.deleteOrganization
 import com.hypto.iam.server.models.CreateOrganizationRequest
 import com.hypto.iam.server.models.CreateOrganizationResponse
 import com.hypto.iam.server.models.Organization
@@ -145,7 +145,7 @@ internal class OrganizationApiKtTest : BaseSingleAppTest() {
             Assertions.assertEquals(1, policies.data?.size)
             Assertions.assertEquals("admin", policies.data!![0].name)
 
-            deleteOrganization(orgId)
+            testApp.deleteOrganization(orgId)
         }
     }
 
@@ -244,7 +244,7 @@ internal class OrganizationApiKtTest : BaseSingleAppTest() {
             assertEquals(requestBody.name, responseBody.organization.name)
             assertEquals(10, responseBody.organization.id.length)
 
-            deleteOrganization(orgId)
+            testApp.deleteOrganization(orgId)
         }
     }
 
@@ -310,7 +310,7 @@ internal class OrganizationApiKtTest : BaseSingleAppTest() {
             assertEquals(orgName, responseBody.organization.name)
             assertEquals(10, responseBody.organization.id.length)
 
-            deleteOrganization(orgId)
+            testApp.deleteOrganization(orgId)
         }
     }
 
@@ -358,7 +358,7 @@ internal class OrganizationApiKtTest : BaseSingleAppTest() {
 
             // Cleanup
             val orgId = responseBody.organization.id
-            deleteOrganization(orgId)
+            testApp.deleteOrganization(orgId)
         }
     }
 
@@ -478,7 +478,7 @@ internal class OrganizationApiKtTest : BaseSingleAppTest() {
             assertFalse(response.headers.contains(HttpHeaders.ContentType))
             assertNull(response.headers[Constants.X_ORGANIZATION_HEADER])
 
-            deleteOrganization(createdOrganization.organization.id)
+            testApp.deleteOrganization(createdOrganization.organization.id)
         }
     }
 
@@ -525,7 +525,7 @@ internal class OrganizationApiKtTest : BaseSingleAppTest() {
             val fetchedOrganization = gson.fromJson(response.bodyAsText(), Organization::class.java)
             assertEquals(createdOrganization.organization, fetchedOrganization)
 
-            deleteOrganization(createdOrganization.organization.id)
+            testApp.deleteOrganization(createdOrganization.organization.id)
         }
     }
 
@@ -572,7 +572,7 @@ internal class OrganizationApiKtTest : BaseSingleAppTest() {
                 }
             // These assertions
             assertEquals(HttpStatusCode.Forbidden, response.status)
-            deleteOrganization(createdOrganization.organization.id)
+            testApp.deleteOrganization(createdOrganization.organization.id)
         }
     }
 

diff --git a/src/test/kotlin/com/hypto/iam/server/apis/PolicyApiTest.kt b/src/test/kotlin/com/hypto/iam/server/apis/PolicyApiTest.kt
@@ -9,6 +9,7 @@ import com.hypto.iam.server.helpers.DataSetupHelperV3.createAndAttachPolicy
 import com.hypto.iam.server.helpers.DataSetupHelperV3.createOrganization
 import com.hypto.iam.server.helpers.DataSetupHelperV3.createResourceActionHrn
 import com.hypto.iam.server.helpers.DataSetupHelperV3.createUser
+import com.hypto.iam.server.helpers.DataSetupHelperV3.deleteOrganization
 import com.hypto.iam.server.models.CreatePolicyFromTemplateRequest
 import com.hypto.iam.server.models.CreatePolicyRequest
 import com.hypto.iam.server.models.CreateUserRequest
@@ -100,7 +101,7 @@ internal class PolicyApiTest : BaseSingleAppTest() {
                 Assertions.assertEquals(1, responseBody.version)
                 Assertions.assertEquals(policyStatements, responseBody.statements)
 
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
 
@@ -252,7 +253,7 @@ internal class PolicyApiTest : BaseSingleAppTest() {
                     response.contentType(),
                 )
 
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
 
@@ -334,7 +335,7 @@ internal class PolicyApiTest : BaseSingleAppTest() {
 
                 // cleanup
                 policyTempRecord.delete()
-                deleteOrganization(createdOrganization.id)
+                testApp.deleteOrganization(createdOrganization.id)
             }
         }
     }
@@ -1037,7 +1038,7 @@ internal class PolicyApiTest : BaseSingleAppTest() {
                         header(HttpHeaders.ContentType, ContentType.Application.Json.toString())
                     }
                 Assertions.assertEquals(HttpStatusCode.Forbidden, response.status)
-                deleteOrganization(organization.id)
+                testApp.deleteOrganization(organization.id)
             }
         }
 
@@ -1108,7 +1109,7 @@ internal class PolicyApiTest : BaseSingleAppTest() {
 
                 val responseBody = gson.fromJson(response.bodyAsText(), PolicyPaginatedResponse::class.java)
                 Assertions.assertEquals(0, responseBody.data!!.size)
-                deleteOrganization(organization.id)
+                testApp.deleteOrganization(organization.id)
             }
         }
     }