refactor: cleanups, move common stuff to own module

nais · Feb 8, 2022 · 330f378 · 330f378
1 parent e076afd
commit 330f378
Show file tree

Hide file tree

Showing 31 changed files with 371 additions and 349 deletions.
diff --git a/.github/workflows/azure.yaml b/.github/workflows/azure.yaml
@@ -16,18 +16,12 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 16
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: 16
-
-      - name: Setup build cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'gradle'
 
       - name: Setup Gradle wrapper cache
         uses: actions/cache@v2
@@ -37,8 +31,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-wrapper-
 
+      - name: Verify Gradle wrapper checksum
+        uses: gradle/wrapper-validation-action@v1
+
       - name: Build with Gradle
-        run: ./gradlew clean azure:build azure:shadowJar
+        run: ./gradlew clean wonderwalled-azure:build wonderwalled-azure:shadowJar
 
       - name: Login to GitHub Docker Registry
         uses: docker/login-action@v1
@@ -48,12 +45,12 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push the Docker image
-        working-directory: ./azure
+        working-directory: ./wonderwalled-azure
         run: |
           docker build --pull --tag ${IMAGE} .
           docker push ${IMAGE}
 
-  deploy-dev-gcp:
+  deploy:
     name: Deploy to dev-gcp
     needs: build
     runs-on: ubuntu-latest
@@ -64,17 +61,3 @@ jobs:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .nais/azure.yaml
-          VARS: .nais/dev/azure.yaml
-
-  deploy-prod-gcp:
-    name: Deploy to prod-gcp
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: nais/deploy/actions/deploy@v1
-        env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-          CLUSTER: prod-gcp
-          RESOURCE: .nais/azure.yaml
-          VARS: .nais/prod/azure.yaml
diff --git a/.github/workflows/idporten.yaml b/.github/workflows/idporten.yaml
@@ -16,18 +16,12 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 16
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: 16
-
-      - name: Setup build cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'gradle'
 
       - name: Setup Gradle wrapper cache
         uses: actions/cache@v2
@@ -37,8 +31,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-wrapper-
 
+      - name: Verify Gradle wrapper checksum
+        uses: gradle/wrapper-validation-action@v1
+
       - name: Build with Gradle
-        run: ./gradlew clean idporten:build idporten:shadowJar
+        run: ./gradlew clean wonderwalled-idporten:build wonderwalled-idporten:shadowJar
 
       - name: Login to GitHub Docker Registry
         uses: docker/login-action@v1
@@ -48,12 +45,12 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push the Docker image
-        working-directory: ./idporten
+        working-directory: ./wonderwalled-idporten
         run: |
           docker build --pull --tag ${IMAGE} .
           docker push ${IMAGE}
 
-  deploy-dev:
+  deploy:
     name: Deploy to dev-gcp
     needs: build
     runs-on: ubuntu-latest
@@ -64,17 +61,3 @@ jobs:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .nais/idporten.yaml
-          VARS: .nais/dev/idporten.yaml
-
-  deploy-prod:
-    name: Deploy to prod-gcp
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: nais/deploy/actions/deploy@v1
-        env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-          CLUSTER: prod-gcp
-          RESOURCE: .nais/idporten.yaml
-          VARS: .nais/prod/idporten.yaml
diff --git a/.nais/azure.yaml b/.nais/azure.yaml
@@ -31,7 +31,7 @@ spec:
       cpu: "50m"
       memory: "256Mi"
   ingresses:
-    - {{ ingress }}
+    - https://wonderwalled.dev.intern.nav.no
   azure:
     application:
       enabled: true

diff --git a/.nais/dev/azure.yaml b/.nais/dev/azure.yaml
diff --git a/.nais/dev/idporten.yaml b/.nais/dev/idporten.yaml
diff --git a/.nais/idporten.yaml b/.nais/idporten.yaml
@@ -31,7 +31,7 @@ spec:
       cpu: "50m"
       memory: "256Mi"
   ingresses:
-    - {{ ingress }}
+    - https://wonderwalled.dev.nav.no
   idporten:
     enabled: true
     sidecar:

diff --git a/.nais/prod/azure.yaml b/.nais/prod/azure.yaml
diff --git a/.nais/prod/idporten.yaml b/.nais/prod/idporten.yaml
diff --git a/azure/src/main/kotlin/io/nais/Wonderwalled.kt b/azure/src/main/kotlin/io/nais/Wonderwalled.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,16 +1,16 @@
 object Versions {
     const val konfig = "1.6.10.0"
     const val kotlinlogging = "2.0.10"
-    const val ktor = "1.6.4"
-    const val logstash = "6.6"
-    const val logback = "1.2.3"
+    const val ktor = "1.6.7"
+    const val logstash = "7.0.1"
+    const val logback = "1.2.9"
 }
 
 plugins {
-    kotlin("jvm") version "1.5.21"
-    id("org.jmailen.kotlinter") version "3.6.0"
+    kotlin("jvm") version "1.6.10"
+    id("org.jmailen.kotlinter") version "3.7.0"
     id("com.github.ben-manes.versions") version "0.39.0"
-    id("com.github.johnrengelman.shadow") version "7.1.0" apply false
+    id("com.github.johnrengelman.shadow") version "7.1.1" apply false
 }
 
 allprojects {
@@ -28,8 +28,8 @@ subprojects {
     apply(plugin = "com.github.johnrengelman.shadow")
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_16
-        targetCompatibility = JavaVersion.VERSION_16
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     tasks {
@@ -38,7 +38,7 @@ subprojects {
         }
         withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
             kotlinOptions {
-                jvmTarget = "16"
+                jvmTarget = "17"
             }
         }
         withType<Jar> {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists