new conductor api

.env.example

@@ -4,6 +4,9 @@ DATABASE_URL="postgresql://postgres:postgres@localhost:5432/frinx"
 UNICONFIG_API_PROTOCOL=http
 UNICONFIG_API_PORT=4000
 UNICONFIG_LIST_URL=http://localhost:4000/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"
 SHELL_HOST=10.19.0.12
 X_TENANT_ID="frinx"
 TOPOLOGY_ENABLED=true
@@ -12,3 +15,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

@@ -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

.github/workflows/pr-check.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - master
+      - story-new-conductor-api
 jobs:
   pr-check:
     runs-on: ubuntu-latest
@@ -42,6 +43,9 @@ 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
       - name: Run eslint 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

@@ -17,6 +17,10 @@ RUN yarn 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
 

README.md

@@ -25,6 +25,9 @@ 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"
 ```
 

codegen-resource-manager.yml

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

codegen-scheduler.yml

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

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frinx/inventory-server",
-  "version": "1.9.2",
+  "version": "2.0.1",
   "engines": {
     "node": "18"
   },
@@ -20,10 +20,18 @@
     "formatter:check": "prettier -l '*.md' '**/*.ts' '**/*.js' '**/*.json' ",
     "test:generate": "cross-env NODE_ENV=testing ts-node --transpile-only -r dotenv/config src/schema/index.ts",
     "jest": "cross-env NODE_ENV=testing jest --verbose",
-    "test": "run-s test:generate jest"
+    "test": "run-s test:generate jest",
+    "codegen:scheduler": "graphql-codegen --config codegen-scheduler.yml",
+    "codegen:resource-manager": "graphql-codegen --config codegen-resource-manager.yml",
+    "codegen:topology-discovery": "graphql-codegen --config codegen-topology-discovery.yml",
+    "codegen": "yarn codegen:scheduler && yarn codegen:resource-manager"
   },
   "devDependencies": {
     "@frinx/eslint-config-typescript-base": "15.0.0-build.1",
+    "@graphql-codegen/cli": "3.3.1",
+    "@graphql-codegen/introspection": "^3.0.1",
+    "@graphql-codegen/typescript": "^3.0.4",
+    "@graphql-codegen/typescript-operations": "^3.0.4",
     "@types/jest": "28.1.8",
     "@types/ssh2": "^1.11.6",
     "@typescript-eslint/eslint-plugin": "5.54.0",
@@ -38,7 +46,6 @@
     "eslint-plugin-import": "2.27.5",
     "get-port": "5.1.1",
     "glob": "8.1.0",
-    "graphql-request": "4.3.0",
     "jest": "28.1.3",
     "npm-run-all": "4.1.5",
     "prettier": "2.8.8",
@@ -51,7 +58,7 @@
   "dependencies": {
     "@devoxa/prisma-relay-cursor-connection": "2.2.2",
     "@graphql-tools/schema": "^9.0.9",
-    "@prisma/client": "4.2.1",
+    "@prisma/client": "5.1.1",
     "@types/express": "4.17.13",
     "@types/graphql-upload": "15.0.2",
     "@types/json-templates": "3.0.0",
@@ -71,6 +78,7 @@
     "fp-ts": "2.15.0",
     "graphql": "16.6.0",
     "graphql-relay": "0.10.0",
+    "graphql-request": "^6.0.0",
     "graphql-upload": "15.0.2",
     "graphql-ws": "^5.11.2",
     "i18n-iso-countries": "7.5.0",
@@ -82,7 +90,7 @@
     "node-ssh": "^13.0.0",
     "pino": "8.11.0",
     "pino-pretty": "9.4.0",
-    "prisma": "4.2.1",
+    "prisma": "5.1.1",
     "ssh2": "^1.11.0",
     "url-join": "4.0.1",
     "uuid": "^9.0.0",

prisma/seed.js

@@ -10,7 +10,7 @@ const csv_parse_1 = require('csv-parse');
 const fs_1 = require('fs');
 const json_templates_1 = __importDefault(require('json-templates'));
 const import_csv_helpers_1 = require('../helpers/import-csv.helpers');
-const unwrap_1 = __importDefault(require('../helpers/unwrap'));
+const utils_helpers_1 = require('../helpers/utils.helpers');
 const DEFAULT_UNICONFIG_ZONE = 'localhost';
 const { X_TENANT_ID } = process.env;
 if (!X_TENANT_ID) {
@@ -70,7 +70,7 @@ async function getCreateDevicesArgs() {
     return {
       name: node_id,
       tenantId,
-      uniconfigZoneId: (0, unwrap_1.default)(uniconfigZoneId).id,
+      uniconfigZoneId: (0, utils_helpers_1.unwrap)(uniconfigZoneId).id,
       managementIp: ip_address,
       port: port_number,
       software: device_type,

prisma/seed.ts

@@ -3,7 +3,7 @@ import { parse } from 'csv-parse';
 import { createReadStream } from 'fs';
 import jsonParse from 'json-templates';
 import { CSVParserToPromise, CSVValuesToJSON, isHeaderValid, JSONDevice } from '../src/helpers/import-csv.helpers';
-import unwrap from '../src/helpers/unwrap';
+import { unwrap } from '../src/helpers/utils.helpers';
 
 const DEFAULT_UNICONFIG_ZONE = 'localhost';