decrease time when cache is cleared to 30 seconds

.dockerignore

@@ -10,7 +10,7 @@
 # now we add what we want to be not-ignored
 !/provoke.txt
 !/package.json
-!/yarn.lock
+!/package-lock.json
 !/src
 !/tsconfig.json
 !/tsconfig.production.json

.env.example

@@ -12,3 +12,4 @@ TOPOLOGY_ENABLED=true
 # if TOPOLOGY_ENABLED=false they are ignored
 # either define all of them or do not define them at all
 TOPOLOGY_DISCOVERY_API_URL=http://10.19.0.5:8080/api/topology/data
+TOPOLOGY_DISCOVERY_GRAPHQL_API_URL=http://localhost:5000/api/graphql

.eslintignore

@@ -5,4 +5,7 @@ prettier.config.js
 nexus-typegen.ts
 jest.config.js
 seed.ts
-init.ts
+init.ts
+src/helpers/base64.helpers.ts
+src/helpers/connection.helpers.ts
+src/__generated__/*.graphql.ts

.github/workflows/docker-publish.yml

@@ -5,7 +5,7 @@ on:
   push:
     # Publish `master` as Docker `latest` image.
     branches:
-      - master
+      - story-new-graphql-proxy
 
     # Publish `v1.2.3` tags as releases.
     tags:
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME
+        run: docker build --build-arg git_commit=$(git rev-parse HEAD) . --file Dockerfile --tag $IMAGE_NAME
 
       - name: Log into docker hub
         run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
@@ -41,21 +41,21 @@ jobs:
           VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
           # Strip "v" prefix from tag name
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-          # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=latest
+          # Use Docker `graphql_proxy` tag convention
+          [ "$VERSION" == "story-new-graphql-proxy" ] && VERSION=graphql_proxy
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
           docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
-          # Add latest tag if we are on master and github.ref points to a tag
+          # Add graphql_proxy tag if we are on story-new-graphql-proxy and github.ref points to a tag
           if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
-            MASTER=$(git show-ref --hash origin/master)
+            MASTER=$(git show-ref --hash origin/story-new-graphql-proxy)
             echo "master: $MASTER"
             HEAD=$(git rev-parse HEAD)
             echo "head: $HEAD"
             echo "github.ref ${{ github.ref }}"
             if [[ $MASTER == $HEAD ]]; then
-              VERSION=latest
+              VERSION=graphql_proxy
               echo VERSION=$VERSION
               docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
               docker push $IMAGE_ID:$VERSION

.github/workflows/hive-cd.yml

@@ -0,0 +1,22 @@
+name: Hive Publish
+
+on:
+  push:
+    branches: [story-new-graphql-proxy]
+
+jobs:
+  hive-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: schema publish
+        env:
+          HIVE_TOKEN: ${{ secrets.HIVE_TOKEN_DEVELOPMENT }}
+          # HIVE_ENDPOINT: ${{ secrets.HIVE_ENDPOINT }}
+          SCHEMA_PATH: "src/schema/api.graphql"
+        run: |
+          curl -sSL https://graphql-hive.com/install.sh | sh
+          hive schema:publish "${{ env.SCHEMA_PATH }}" \
+            --registry.accessToken ${{ env.HIVE_TOKEN }} \
+            --github

.github/workflows/hive-ci.yml

@@ -0,0 +1,22 @@
+name: Hive Check
+
+on:
+  pull_request:
+    branches: [story-new-graphql-proxy]
+
+jobs:
+  hive-check:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: schema check
+        env:
+          HIVE_TOKEN: ${{ secrets.HIVE_TOKEN_DEVELOPMENT }}
+          SCHEMA_PATH: "src/schema/api.graphql"
+        run: |
+          curl -sSL https://graphql-hive.com/install.sh | sh
+          hive schema:check "${{ env.SCHEMA_PATH }}" \
+            --registry.accessToken ${{ env.HIVE_TOKEN }} \
+            --github

.github/workflows/pr-check.yml

@@ -3,6 +3,8 @@ on:
   pull_request:
     branches:
       - master
+      - story-new-conductor-api
+      - story-new-graphql-proxy
 jobs:
   pr-check:
     runs-on: ubuntu-latest
@@ -24,14 +26,12 @@ jobs:
         uses: actions/checkout@v3
       - name: Install apt deps
         run: apt-get update && apt-get install -y openssl
-      - name: Copy yarn.lock file
-        run: cp yarn.lock yarn.lock.orig
       - name: Install dependencies
-        run: yarn install --immutable
+        run: npm ci
       - name: Generate prisma client
-        run: yarn run prisma:generate
+        run: npm run prisma:generate
       - name: Test the code
-        run: yarn run test
+        run: npm test
         env:
           DATABASE_URL: postgresql://postgres:postgres@postgres:5432/frinx
           HOST: localhost
@@ -42,9 +42,12 @@ jobs:
           X_TENANT_ID: frinx
           TOPOLOGY_ENABLED: false
           SHELL_HOST: 10.19.0.12
+          CONDUCTOR_API_URL: 10.19.0.7
+          SCHEDULER_API_URL: 10.19.0.7
+          RESOURCE_MANAGER_API_URL: 10.19.0.7
       - name: Check code formatting
-        run: yarn run formatter:check
+        run: npm run formatter:check
       - name: Run eslint check
-        run: yarn run lint
+        run: npm run lint
       - name: Run TS typecheck
-        run: yarn run type-check
+        run: npm run type-check

.gitignore

@@ -96,4 +96,6 @@ build
 !/.yarn/plugins
 !/.yarn/sdks
 !/.yarn/versions
-/.pnp.*
+/.pnp.*
+
+.idea

.prettierignore

@@ -1,2 +1,3 @@
 build
-coverage
+coverage
+src/__generated__

Dockerfile

@@ -6,17 +6,21 @@ RUN apt-get install -y openssl
 RUN mkdir /app
 
 # We need to set production for Node.js
-# first we copy things that are needed for yarn-install
+# first we copy things that are needed for npm-install
 COPY . /app/
 
 WORKDIR /app
-RUN yarn install --immutable
+RUN npm ci
 ENV NODE_ENV production
-RUN yarn run prisma:generate
-RUN yarn run build
+RUN npm run prisma:generate
+RUN npm run build
 
 FROM node:18-slim
 
+ARG git_commit=unspecified
+LABEL git_commit="${git_commit}"
+LABEL org.opencontainers.image.source="https://github.com/FRINXio/frinx-inventory-server"
+
 RUN apt-get update
 RUN apt-get install -y openssl wget
 
@@ -39,10 +43,11 @@ COPY --from=build /app/build /app
 COPY --from=build /app/prisma /app/prisma
 COPY --from=build /app/sample.csv /app/sample.csv
 COPY --from=build /app/package.json /app
+COPY --from=build /app/package-lock.json /app
 
 WORKDIR /app
 USER root
-RUN yarn install --production
+RUN npm install --production
 USER node
 
 CMD ["node", "index.js"]

README.md

@@ -9,22 +9,26 @@
 ## Running development version
 
 ```bash
-$ docker compose up
-$ yarn run prisma:generate
-$ yarn run dev
+docker compose up
+yarn run prisma:generate
+yarn run dev
 ```
 
-`docker compose up` will initialize a database along with some sample development data. Run `docker compose down` to start fresh.
+`docker compose up` will initialize a database along with some sample development data.
+Run `docker compose down` to start fresh.
 
 ## Enviroment variables
 
 Example values are stored in `.env.example` in the root of the repository. These are required values:
 
-```
+```bash
 DATABASE_URL="postgresql://postgres:postgres@localhost:5432/frinx"
 UNICONFIG_API_PROTOCOL=http
 UNICONFIG_API_PORT=8181
 UNICONFIG_LIST_URL=http://10.19.0.7/static/list/uniconfig
+CONDUCTOR_API_URL="http:/10.19.0.7:8080/api"
+SCHEDULER_API_URL="http://10.19.0.7:3001/query"
+RESOURCE_MANAGER_API_URL="http://10.19.0.7/api/resource"
 X_TENANT_ID="frinx"
 ```
 
@@ -35,22 +39,22 @@ X_TENANT_ID="frinx"
 To seed postgre data:
 
 ```bash
-$ yarn prisma:seed
-$ yarn prisma:seed -z <uniconfig_zone> # with optional uniconfigZone parameter
+yarn prisma:seed
+yarn prisma:seed -z <uniconfig_zone> # with optional uniconfigZone parameter
 ```
 
 ### Production
 
 Both script are compiled and included in running docker. So you can connect to running docker and run the script inside:
 
 ```bash
-$ docker exec -it <inventory-container-id> sh
-$ node prisma/seed.js
+docker exec -it <inventory-container-id> sh
+node prisma/seed.js
 ```
 
 Or you can run it directly using:
 
 ```bash
-$ docker exec <inventory-container-id> node prisma/seed.js
+docker exec <inventory-container-id> node prisma/seed.js
 
 ```

codegen-topology-discovery.yml

@@ -0,0 +1,15 @@
+schema:
+  - 'http://localhost:5000/api/graphql'
+documents:
+  - './src/external-api/topology-discovery-graphql.ts'
+generates:
+  src/__generated__/topology-discovery.graphql.ts:
+    plugins:
+      - 'typescript'
+      - 'typescript-operations'
+    config:
+      enumsAsTypes: true
+      avoidOptionals:
+        field: true
+        object: false
+        inputValue: false