Kodex

.editorconfig

@@ -2,5 +2,5 @@ root = true
 
 [*]
 indent_size = 2
-continuation_indent_size = 4
-ij_kotlin_name_count_to_use_star_import = unset
+continuation_indent_size = 2
+ij_kotlin_name_count_to_use_star_import = 5

.fleet/run.json

@@ -0,0 +1,13 @@
+{
+    "configurations": [
+        {
+          "type": "gradle",
+          "name": "Run CLI",
+          "environment": {}, // optional
+          "dependsOn": [], // optional
+          "tasks": [":app:cli:jvmRun"],
+          "args": ["--args='-h'"], // optional
+          "initScripts": {}, // optional
+        }
+    ]
+}

.github/CODEOWNERS

@@ -0,0 +1 @@
+*       @mpetuska

.github/dependabot.yml

@@ -1,14 +1,14 @@
 version: 2
 updates:
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directory: "/.github/workflows"
     schedule:
-      interval: "daily"
+      interval: "monthly"
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "monthly"
   - package-ecosystem: "terraform"
     directory: "/infra"
     schedule:
-      interval: "daily"
+      interval: "monthly"

.github/workflows/check.yml

@@ -0,0 +1,68 @@
+name: Check
+defaults:
+  run:
+    shell: bash
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  check:
+    name: Check on ubuntu-latest
+    runs-on: ubuntu-latest
+    env:
+      GRADLE_OPTS: "-Dorg.gradle.daemon=true"
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: 11
+
+      - name: Restore Gradle cache
+        id: cache
+        uses: actions/[email protected]
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.gradle/yarn
+            ~/.gradle/nodejs
+            ~/.konan
+            ~/.cache/yarn
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-gradle-
+
+      - name: Gradle Check
+        run: ./gradlew detektAll check -x detekt --scan
+
+      - name: Make artifact location URIs relative
+        if: ${{ always() }}
+        continue-on-error: true
+        run: |
+          cp ${{ github.workspace }}/build/reports/detekt/detekt.sarif ${{ github.workspace }}/detekt.sarif.json
+          echo "$(
+            jq \
+              --arg github_workspace ${{ github.workspace }} \
+              '. | ( .runs[].results[].locations[].physicalLocation.artifactLocation.uri |= if test($github_workspace) then .[($github_workspace | length | . + 1):] else . end )' \
+              ${{ github.workspace }}/detekt.sarif.json
+          )" > ${{ github.workspace }}/detekt.sarif.json
+
+      - uses: github/codeql-action/upload-sarif@v2
+        if: ${{ always() }}
+        with:
+          sarif_file: ${{ github.workspace }}/detekt.sarif.json
+          checkout_path: ${{ github.workspace }}
+
+      - uses: actions/upload-artifact@v3
+        if: ${{ always() }}
+        with:
+          name: reports-${{ runner.os }}
+          path: |
+            **/build/reports
+            detekt.sarif.json

.github/workflows/pr.yml

@@ -2,12 +2,20 @@ name: PR CI/CD
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, closed]
+    types: [ opened, synchronize, reopened, closed ]
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
+  check:
+    uses: ./.github/workflows/check.yml
+
   build:
+    needs: [ check ]
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     name: Build App
     runs-on: ubuntu-latest
@@ -36,7 +44,7 @@ jobs:
           path: app/client/build/dist/js/WEB-INF/
           name: static-web-app
           if-no-files-found: error
-          
+
   deploy:
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     name: Deploy Staging

.github/workflows/release-kodex.yml

@@ -2,11 +2,22 @@ name: Release Kodex
 
 on:
   workflow_dispatch:
+  push:
+    branches:
+      - kodex
+
+concurrency:
+  group: kodex
+  cancel-in-progress: false
 
 jobs:
+  #  check:
+  #    uses: ./.github/workflows/check.yml
+
   build:
     name: Build Apps
     runs-on: ubuntu-latest
+    environment: kodex
     env:
       REGISTRY: ghcr.io
     steps:
@@ -57,15 +68,19 @@ jobs:
       #          add_git_labels: true
       #          tags: latest
 
-      - name: Build CLI Docker image & push to GitHub Packages
-        uses: docker/build-push-action@v5
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
         with:
-          directory: ./app/cli/
+          registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ github.token }}
-          registry: ${{ env.REGISTRY }}
-          image: ${{ env.REGISTRY }}/${{ github.repository }}/kodex/cli
-          addLatest: true
+
+      - name: Build CLI Docker image & push to GitHub Packages
+        uses: docker/build-push-action@v3
+        with:
+          context: ./app/cli/
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ github.repository }}/kodex/cli:latest
 
 #  deploy-Infrastructure:
 #    runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -6,9 +6,13 @@ on:
     types: [ created ]
 
 jobs:
+  check:
+    uses: ./.github/workflows/check.yml
+
   build:
     name: Build App
     runs-on: ubuntu-latest
+    needs: [ check ]
     steps:
       - uses: actions/[email protected]
       - name: Restore Gradle cache
@@ -32,29 +36,29 @@ jobs:
         uses: actions/upload-artifact@v2
         id: upload
         with:
-          path: app/build/dist/WEB-INF
+          path: app/client/build/dist/js/WEB-INF/
           name: static-web-app
           if-no-files-found: error
-      - name: Build App Docker image & push to GitHub Packages
+      - name: Build Server Docker image & push to GitHub Packages
         uses: docker/build-push-action@v1
         with:
-          path: app
+          path: app/server/
           username: ${{ github.actor }}
           password: ${{ github.token }}
           registry: docker.pkg.github.com
-          repository: mpetuska/kamp/app
+          repository: mpetuska/kamp/server
           tag_with_ref: true
           tag_with_sha: true
           add_git_labels: true
           tags: latest
-      - name: Build Scanner Docker image & push to GitHub Packages
+      - name: Build CLI Docker image & push to GitHub Packages
         uses: docker/build-push-action@v1
         with:
-          path: scanner
+          path: app/cli/
           username: ${{ github.actor }}
           password: ${{ github.token }}
           registry: docker.pkg.github.com
-          repository: mpetuska/kamp/scanner
+          repository: mpetuska/kamp/cli
           tag_with_ref: true
           tag_with_sha: true
           add_git_labels: true
@@ -94,7 +98,7 @@ jobs:
         env:
           TF_VAR_docker_registry_username: ${{ secrets.GH_PKG_USER }}
           TF_VAR_docker_registry_password: ${{ secrets.GH_PKG_PASSWORD }}
-          TF_VAR_docker_image_tag: docker.pkg.github.com/mpetuska/kamp/app:sha-${{ steps.short-sha.outputs.sha }}
+          TF_VAR_docker_image_tag: docker.pkg.github.com/mpetuska/kamp/server:sha-${{ steps.short-sha.outputs.sha }}
           TF_VAR_api_admin_user: ${{ secrets.API_ADMIN_USER }}
           TF_VAR_api_admin_password: ${{ secrets.API_ADMIN_PASSWORD }}
 
@@ -119,6 +123,6 @@ jobs:
         uses: Azure/[email protected]
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APP_API_TOKEN }}
-          repo_token: ${{ github.token }} # Used for Github integrations (i.e. PR comments)
+          repo_token: ${{ github.token }}
           action: "upload"
           app_location: "/dist"