Add 'application-inventory' to the Github and development workflow (#14)

konveyor · Mar 8, 2021 · d85fb56 · d85fb56
1 parent db6eb4b
commit d85fb56
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 127 deletions.
diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
@@ -53,7 +53,7 @@ jobs:
       controls-db:
         image: postgres:13.1
         ports:
-          - 5432:5432
+          - 5433:5432
         env:
           POSTGRES_USER: user
           POSTGRES_PASSWORD: password
@@ -63,6 +63,19 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      application-inventory-db:
+        image: postgres:13.1
+        ports:
+          - 5434:5432
+        env:
+          POSTGRES_USER: user
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: application_inventory_db
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -75,7 +88,7 @@ jobs:
           kcadm: create realms -f konveyor-realm.json
       - name: Controls API
         run: |
-          docker run -d --name controls --network ${{ job.services.controls-db.network }} --network-alias controls -p 8080:8080 \
+          docker run -d --name controls --network ${{ job.services.controls-db.network }} --network-alias controls -p 8081:8080 \
           -e QUARKUS_HTTP_PORT=8080 \
           -e QUARKUS_DATASOURCE_USERNAME=user \
           -e QUARKUS_DATASOURCE_PASSWORD=password \
@@ -84,6 +97,17 @@ jobs:
           -e QUARKUS_OIDC_CLIENT_ID=controls-api \
           -e QUARKUS_OIDC_CREDENTIALS_SECRET=secret quay.io/konveyor/tackle-controls:latest-native
           sleep 5s && docker logs controls
+      - name: Application inventory API
+        run: |
+          docker run -d --name application-inventory --network ${{ job.services.application-inventory-db.network }} --network-alias application-inventory -p 8082:8080 \
+          -e QUARKUS_HTTP_PORT=8080 \
+          -e QUARKUS_DATASOURCE_USERNAME=user \
+          -e QUARKUS_DATASOURCE_PASSWORD=password \
+          -e QUARKUS_DATASOURCE_JDBC_URL=jdbc:postgresql://application-inventory-db:5432/application_inventory_db \
+          -e QUARKUS_OIDC_AUTH_SERVER_URL=http://keycloak:8080/auth/realms/konveyor \
+          -e QUARKUS_OIDC_CLIENT_ID=application-inventory-api \
+          -e QUARKUS_OIDC_CREDENTIALS_SECRET=secret quay.io/konveyor/tackle-application-inventory:latest-native
+          sleep 5s && docker logs application-inventory
       - name: Build
         run: |
           yarn install
@@ -161,7 +185,7 @@ jobs:
       controls-db:
         image: postgres:13.1
         ports:
-          - 5432:5432
+          - 5433:5432
         env:
           POSTGRES_USER: user
           POSTGRES_PASSWORD: password
@@ -171,6 +195,19 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      application-inventory-db:
+        image: postgres:13.1
+        ports:
+          - 5434:5432
+        env:
+          POSTGRES_USER: user
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: application_inventory_db
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
       - uses: actions/checkout@v2
       - name: Keycloak Admin CLI
@@ -182,7 +219,7 @@ jobs:
           kcadm: create realms -f konveyor-realm.json
       - name: Controls API
         run: |
-          docker run -d --name controls --network ${{ job.services.controls-db.network }} --network-alias controls -p 8080:8080 \
+          docker run -d --name controls --network ${{ job.services.controls-db.network }} --network-alias controls -p 8081:8080 \
           -e QUARKUS_HTTP_PORT=8080 \
           -e QUARKUS_DATASOURCE_USERNAME=user \
           -e QUARKUS_DATASOURCE_PASSWORD=password \
@@ -192,13 +229,26 @@ jobs:
           -e QUARKUS_OIDC_CREDENTIALS_SECRET=secret \
           quay.io/konveyor/tackle-controls:latest-native
           sleep 5s && docker logs controls
+      - name: Application inventory API
+        run: |
+          docker run -d --name application-inventory --network ${{ job.services.application-inventory-db.network }} --network-alias application-inventory -p 8082:8080 \
+          -e QUARKUS_HTTP_PORT=8080 \
+          -e QUARKUS_DATASOURCE_USERNAME=user \
+          -e QUARKUS_DATASOURCE_PASSWORD=password \
+          -e QUARKUS_DATASOURCE_JDBC_URL=jdbc:postgresql://application-inventory-db:5432/application_inventory_db \
+          -e QUARKUS_OIDC_AUTH_SERVER_URL=http://keycloak:8080/auth/realms/konveyor \
+          -e QUARKUS_OIDC_CLIENT_ID=application-inventory-api \
+          -e QUARKUS_OIDC_CREDENTIALS_SECRET=secret \
+          quay.io/konveyor/tackle-application-inventory:latest-native
+          sleep 5s && docker logs application-inventory
       - name: Tackle UI
         run: |
-          docker run -d --name tackle-ui --network ${{ job.services.controls-db.network }} --network-alias tackle-ui -p 3000:8080 \
+          docker run -d --name tackle-ui --network ${{ job.services.keycloak.network }} --network-alias tackle-ui -p 3000:8080 \
           -e SSO_REALM=konveyor \
           -e SSO_CLIENT_ID=tackle-ui \
           -e SSO_SERVER_URL=http://keycloak:8080/auth \
           -e CONTROLS_API_URL=http://controls:8080/controls \
+          -e APPLICATION_INVENTORY_API_URL=http://application-inventory:8080/application-inventory \
           quay.io/konveyor/tackle-ui:main
           sleep 5s && docker logs tackle-ui
       - name: Cypress run
@@ -212,7 +262,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CYPRESS_auth_base_url: http://localhost:3000/auth
-          CYPRESS_controls_base_url: http://localhost:8080/controls
+          CYPRESS_controls_base_url: http://localhost:8081/controls
+          CYPRESS_application_inventory_base_url: http://localhost:8082/application-inventory
       - uses: actions/upload-artifact@v1
         if: failure()
         with:

diff --git a/.storybook/theme.js b/.storybook/theme.js
@@ -2,7 +2,7 @@
 import { create } from '@storybook/theming/create';
 export default create({
   base: 'light',
-  brandTitle: 'Controls',
+  brandTitle: 'Tackle',
   brandUrl: 'https://github.com/konveyor/tackle-ui',
   brandImage: 'https://raw.githubusercontent.com/konveyor/tackle-ui/main/public/logo192.png',
 });

diff --git a/cypress.json b/cypress.json
@@ -4,7 +4,8 @@
     "auth_base_url": "http://localhost:8180/auth",
     "auth_realm": "konveyor",
     "auth_client_id": "tackle-ui",
-    "controls_base_url": "http://localhost:8080/controls"
+    "controls_base_url": "http://localhost:8081/controls",
+    "application_inventory_base_url": "http://localhost:8082/application-inventory"
   },
   "viewportWidth": 1225,
   "viewportHeight": 886,

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
   controls-db:
     image: postgres:13.1
     ports:
-      - 5432:5432
+      - 5433:5432
     environment:
       POSTGRES_DB: controls_db
       POSTGRES_USER: user
@@ -35,7 +35,7 @@ services:
   controls:
     image: quay.io/konveyor/tackle-controls:latest-native
     ports:
-      - 8080:8080
+      - 8081:8080
     environment:
       QUARKUS_HTTP_PORT: 8080
       QUARKUS_DATASOURCE_USERNAME: user
@@ -55,4 +55,41 @@ services:
       controls-db:
         condition: service_healthy
 
+  application-inventory-db:
+    image: postgres:13.1
+    ports:
+      - 5434:5432
+    environment:
+      POSTGRES_DB: application_inventory_db
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: password
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U user -d application_inventory_db"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  application-inventory:
+    image: quay.io/konveyor/tackle-application-inventory:latest-native
+    ports:
+      - 8082:8080
+    environment:
+      QUARKUS_HTTP_PORT: 8080
+      QUARKUS_DATASOURCE_USERNAME: user
+      QUARKUS_DATASOURCE_PASSWORD: password
+      QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://application-inventory-db:5432/application_inventory_db
+      QUARKUS_OIDC_AUTH_SERVER_URL: http://keycloak:8080/auth/realms/konveyor
+      QUARKUS_OIDC_CLIENT_ID: application-inventory-api
+      QUARKUS_OIDC_CREDENTIALS_SECRET: secret
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/application-inventory/q/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    depends_on:
+      keycloak:
+        condition: service_healthy
+      application-inventory-db:
+        condition: service_healthy
+