From ddaa2d18fa40c2e7829045701d15ece9a46e3341 Mon Sep 17 00:00:00 2001 From: Richard Petersen <richard.petersen@open-xchange.com> Date: Tue, 8 Feb 2022 17:32:37 +0100 Subject: [PATCH] Apply renaming from manifest-service to ui-middleware --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/kubernetes-resources.yaml | 2 +- README.md | 12 +++++------ .../templates/_ingress.tpl | 4 ---- .../templates/tests/test-connection.yaml | 15 -------------- .../.helmignore | 0 .../Chart.lock | 0 .../Chart.yaml | 8 ++++---- .../templates/NOTES.txt | 8 ++++---- .../templates/_helpers.tpl | 20 +++++++++---------- .../core-ui-middleware/templates/_ingress.tpl | 4 ++++ .../templates/configMap.yaml | 0 .../templates/deployment.yaml | 0 .../templates/hpa.yaml | 6 +++--- .../templates/ingress.yaml | 0 .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 4 ++-- .../templates/tests/test-connection.yaml | 15 ++++++++++++++ .../values.yaml | 6 +++--- helm/values/develop.yaml | 4 ++-- okteto.yml.dist | 2 +- package.json | 4 ++-- spec/file-depencies_test.js | 2 +- spec/meta_test.js | 4 ++-- spec/server_test.js | 2 +- src/files.js | 2 +- src/index.js | 2 +- src/meta.js | 4 ++-- src/swagger.yaml | 6 +++--- 29 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 helm/core-manifest-service/templates/_ingress.tpl delete mode 100644 helm/core-manifest-service/templates/tests/test-connection.yaml rename helm/{core-manifest-service => core-ui-middleware}/.helmignore (100%) rename helm/{core-manifest-service => core-ui-middleware}/Chart.lock (100%) rename helm/{core-manifest-service => core-ui-middleware}/Chart.yaml (91%) rename helm/{core-manifest-service => core-ui-middleware}/templates/NOTES.txt (75%) rename helm/{core-manifest-service => core-ui-middleware}/templates/_helpers.tpl (70%) create mode 100644 helm/core-ui-middleware/templates/_ingress.tpl rename helm/{core-manifest-service => core-ui-middleware}/templates/configMap.yaml (100%) rename helm/{core-manifest-service => core-ui-middleware}/templates/deployment.yaml (100%) rename helm/{core-manifest-service => core-ui-middleware}/templates/hpa.yaml (81%) rename helm/{core-manifest-service => core-ui-middleware}/templates/ingress.yaml (100%) rename helm/{core-manifest-service => core-ui-middleware}/templates/service.yaml (100%) rename helm/{core-manifest-service => core-ui-middleware}/templates/serviceaccount.yaml (62%) create mode 100644 helm/core-ui-middleware/templates/tests/test-connection.yaml rename helm/{core-manifest-service => core-ui-middleware}/values.yaml (93%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4bb82d..e292f0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ include: file: '/gitlab-ci/node/kaniko.yml' variables: - INGRESS_HOSTNAME: manifest-$CI_COMMIT_REF_SLUG + INGRESS_HOSTNAME: ui-middleware-$CI_COMMIT_REF_SLUG build image: before_script: @@ -18,7 +18,7 @@ deploy helm chart: name: $CI_COMMIT_REF_SLUG on_stop: tear down auto_stop_in: 1 week - url: https://manifest-$CI_COMMIT_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN + url: https://ui-middleware-$CI_COMMIT_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN after_script: - envsubst < .gitlab-ci/kubernetes-resources.yaml > tmp-k8s-resources.yaml - kubectl apply -f tmp-k8s-resources.yaml diff --git a/.gitlab-ci/kubernetes-resources.yaml b/.gitlab-ci/kubernetes-resources.yaml index 69a5ebf..51a09a8 100644 --- a/.gitlab-ci/kubernetes-resources.yaml +++ b/.gitlab-ci/kubernetes-resources.yaml @@ -18,7 +18,7 @@ metadata: name: ${OX_COMPONENT} spec: rules: - - host: manifest-${CI_COMMIT_REF_SLUG}.k3s.os2.oxui.de + - host: ui-middleware-${CI_COMMIT_REF_SLUG}.k3s.os2.oxui.de http: paths: - path: / diff --git a/README.md b/README.md index 5120944..0eddaec 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# manifest-service +# ui-middleware > Provides the collected manifest.json of services in a cluster as well as a list of dependencies > for each source file. This information can be used to dynamically compile all ui components at @@ -20,18 +20,18 @@ **docker** ``` -docker build -t manifest-service . -docker run -t -i -p 8080:8080 manifest-service +docker build -t ui-middleware . +docker run -t -i -p 8080:8080 ui-middleware ``` **kubernetes** ``` cd helm -helm upgrade -i -f manifest-service/values.yaml -f values/develop.yaml manifest-service ./manifest-service +helm upgrade -i -f ui-middleware/values.yaml -f values/develop.yaml ui-middleware ./ui-middleware ``` -It is possible to horizontally scale the manifest service, as more clients are fetching resources from this service. Each instance maintains a cache of all files locally (in memory), allowing to scale easily. +It is possible to horizontally scale the UI Middleware, as more clients are fetching resources from this service. Each instance maintains a cache of all files locally (in memory), allowing to scale easily. ## Configuration @@ -57,4 +57,4 @@ When using Ingress to make the service available to the public, the service is i configured as a "fallback" or "default" service to answer all requests that are not specified to be served by one of the other services (e.g like everything under /api). This should simplify the Ingress configuration. One example can be found -[in the manifest-service repository](https://gitlab.open-xchange.com/frontend/Infrastructure/manifest-service/-/blob/main/.gitlab-ci/kubernetes-resources.yaml). +[in the ui-middleware repository](https://gitlab.open-xchange.com/frontend/Infrastructure/ui-middleware/-/blob/main/.gitlab-ci/kubernetes-resources.yaml). diff --git a/helm/core-manifest-service/templates/_ingress.tpl b/helm/core-manifest-service/templates/_ingress.tpl deleted file mode 100644 index 8df12d9..0000000 --- a/helm/core-manifest-service/templates/_ingress.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{{- define "core-manifest-service.ingressPathMappings" -}} -paths: - - path: / -{{- end -}} diff --git a/helm/core-manifest-service/templates/tests/test-connection.yaml b/helm/core-manifest-service/templates/tests/test-connection.yaml deleted file mode 100644 index 5694c08..0000000 --- a/helm/core-manifest-service/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "core-manifest-service.fullname" . }}-test-connection" - labels: - {{- include "core-manifest-service.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "core-manifest-service.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/helm/core-manifest-service/.helmignore b/helm/core-ui-middleware/.helmignore similarity index 100% rename from helm/core-manifest-service/.helmignore rename to helm/core-ui-middleware/.helmignore diff --git a/helm/core-manifest-service/Chart.lock b/helm/core-ui-middleware/Chart.lock similarity index 100% rename from helm/core-manifest-service/Chart.lock rename to helm/core-ui-middleware/Chart.lock diff --git a/helm/core-manifest-service/Chart.yaml b/helm/core-ui-middleware/Chart.yaml similarity index 91% rename from helm/core-manifest-service/Chart.yaml rename to helm/core-ui-middleware/Chart.yaml index 117773a..e46a184 100644 --- a/helm/core-manifest-service/Chart.yaml +++ b/helm/core-ui-middleware/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -name: core-manifest-service -description: Helm chart for core manifest service +name: core-ui-middleware +description: Helm chart for core ui middleware # A chart can be either an 'application' or a 'library' chart. # @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.0.5 +version: 1.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.1.0" +appVersion: "1.0.0" dependencies: - name: ox-common version: 1.0.17 diff --git a/helm/core-manifest-service/templates/NOTES.txt b/helm/core-ui-middleware/templates/NOTES.txt similarity index 75% rename from helm/core-manifest-service/templates/NOTES.txt rename to helm/core-ui-middleware/templates/NOTES.txt index 091f37d..f08ecd0 100644 --- a/helm/core-manifest-service/templates/NOTES.txt +++ b/helm/core-ui-middleware/templates/NOTES.txt @@ -6,16 +6,16 @@ {{- end }} {{- end }} {{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "core-manifest-service.fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "core-ui-middleware.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT {{- else if contains "LoadBalancer" .Values.service.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "core-manifest-service.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "core-manifest-service.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "core-ui-middleware.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "core-ui-middleware.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo http://$SERVICE_IP:{{ .Values.service.port }} {{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "core-manifest-service.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "core-ui-middleware.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") echo "Visit http://127.0.0.1:8080 to use your application" kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT diff --git a/helm/core-manifest-service/templates/_helpers.tpl b/helm/core-ui-middleware/templates/_helpers.tpl similarity index 70% rename from helm/core-manifest-service/templates/_helpers.tpl rename to helm/core-ui-middleware/templates/_helpers.tpl index 8139242..bb0eb98 100644 --- a/helm/core-manifest-service/templates/_helpers.tpl +++ b/helm/core-ui-middleware/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "core-manifest-service.name" -}} +{{- define "core-ui-middleware.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -10,7 +10,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "core-manifest-service.fullname" -}} +{{- define "core-ui-middleware.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "core-manifest-service.chart" -}} +{{- define "core-ui-middleware.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "core-manifest-service.labels" -}} -helm.sh/chart: {{ include "core-manifest-service.chart" . }} -{{ include "core-manifest-service.selectorLabels" . }} +{{- define "core-ui-middleware.labels" -}} +helm.sh/chart: {{ include "core-ui-middleware.chart" . }} +{{ include "core-ui-middleware.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "core-manifest-service.selectorLabels" -}} -app.kubernetes.io/name: {{ include "core-manifest-service.name" . }} +{{- define "core-ui-middleware.selectorLabels" -}} +app.kubernetes.io/name: {{ include "core-ui-middleware.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "core-manifest-service.serviceAccountName" -}} +{{- define "core-ui-middleware.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "core-manifest-service.fullname" .) .Values.serviceAccount.name }} +{{- default (include "core-ui-middleware.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/helm/core-ui-middleware/templates/_ingress.tpl b/helm/core-ui-middleware/templates/_ingress.tpl new file mode 100644 index 0000000..3da6a48 --- /dev/null +++ b/helm/core-ui-middleware/templates/_ingress.tpl @@ -0,0 +1,4 @@ +{{- define "core-ui-middleware.ingressPathMappings" -}} +paths: + - path: / +{{- end -}} diff --git a/helm/core-manifest-service/templates/configMap.yaml b/helm/core-ui-middleware/templates/configMap.yaml similarity index 100% rename from helm/core-manifest-service/templates/configMap.yaml rename to helm/core-ui-middleware/templates/configMap.yaml diff --git a/helm/core-manifest-service/templates/deployment.yaml b/helm/core-ui-middleware/templates/deployment.yaml similarity index 100% rename from helm/core-manifest-service/templates/deployment.yaml rename to helm/core-ui-middleware/templates/deployment.yaml diff --git a/helm/core-manifest-service/templates/hpa.yaml b/helm/core-ui-middleware/templates/hpa.yaml similarity index 81% rename from helm/core-manifest-service/templates/hpa.yaml rename to helm/core-ui-middleware/templates/hpa.yaml index 03d4e96..e639743 100644 --- a/helm/core-manifest-service/templates/hpa.yaml +++ b/helm/core-ui-middleware/templates/hpa.yaml @@ -2,14 +2,14 @@ apiVersion: autoscaling/v2beta1 kind: HorizontalPodAutoscaler metadata: - name: {{ include "core-manifest-service.fullname" . }} + name: {{ include "core-ui-middleware.fullname" . }} labels: - {{- include "core-manifest-service.labels" . | nindent 4 }} + {{- include "core-ui-middleware.labels" . | nindent 4 }} spec: scaleTargetRef: apiVersion: apps/v1 kind: Deployment - name: {{ include "core-manifest-service.fullname" . }} + name: {{ include "core-ui-middleware.fullname" . }} minReplicas: {{ .Values.autoscaling.minReplicas }} maxReplicas: {{ .Values.autoscaling.maxReplicas }} metrics: diff --git a/helm/core-manifest-service/templates/ingress.yaml b/helm/core-ui-middleware/templates/ingress.yaml similarity index 100% rename from helm/core-manifest-service/templates/ingress.yaml rename to helm/core-ui-middleware/templates/ingress.yaml diff --git a/helm/core-manifest-service/templates/service.yaml b/helm/core-ui-middleware/templates/service.yaml similarity index 100% rename from helm/core-manifest-service/templates/service.yaml rename to helm/core-ui-middleware/templates/service.yaml diff --git a/helm/core-manifest-service/templates/serviceaccount.yaml b/helm/core-ui-middleware/templates/serviceaccount.yaml similarity index 62% rename from helm/core-manifest-service/templates/serviceaccount.yaml rename to helm/core-ui-middleware/templates/serviceaccount.yaml index 0397682..b606f55 100644 --- a/helm/core-manifest-service/templates/serviceaccount.yaml +++ b/helm/core-ui-middleware/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "core-manifest-service.serviceAccountName" . }} + name: {{ include "core-ui-middleware.serviceAccountName" . }} labels: - {{- include "core-manifest-service.labels" . | nindent 4 }} + {{- include "core-ui-middleware.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/helm/core-ui-middleware/templates/tests/test-connection.yaml b/helm/core-ui-middleware/templates/tests/test-connection.yaml new file mode 100644 index 0000000..0d26cda --- /dev/null +++ b/helm/core-ui-middleware/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "core-ui-middleware.fullname" . }}-test-connection" + labels: + {{- include "core-ui-middleware.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "core-ui-middleware.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/helm/core-manifest-service/values.yaml b/helm/core-ui-middleware/values.yaml similarity index 93% rename from helm/core-manifest-service/values.yaml rename to helm/core-ui-middleware/values.yaml index ff2ea44..3886417 100644 --- a/helm/core-manifest-service/values.yaml +++ b/helm/core-ui-middleware/values.yaml @@ -1,4 +1,4 @@ -# Default values for core-manifest-service. +# Default values for core-ui-middleware. # This is a YAML-formatted file. # Declare variables to be passed into your templates. @@ -9,7 +9,7 @@ defaultRegistry: registry.open-xchange.com containerPort: 8080 image: - repository: "core-manifest-service" + repository: "core-ui-middleware" pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" @@ -51,7 +51,7 @@ service: ingress: enabled: true - pathMappings: "core-manifest-service.ingressPathMappings" + pathMappings: "core-ui-middleware.ingressPathMappings" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/helm/values/develop.yaml b/helm/values/develop.yaml index dd0afd7..0108291 100644 --- a/helm/values/develop.yaml +++ b/helm/values/develop.yaml @@ -1,11 +1,11 @@ replicaCount: 1 containerPort: 8080 baseUrls: - - https://manifest-service-dummy.k3s.os.oxui.de/manifest.json + - https://ui-middleware-dummy.k3s.os.oxui.de/manifest.json ingress: enabled: true hosts: - - host: manifest-${CI_COMMIT_REF_SLUG}.k3s.os.oxui.de + - host: ui-middleware-${CI_COMMIT_REF_SLUG}.k3s.os.oxui.de paths: - path: / pathType: ImplementationSpecific diff --git a/okteto.yml.dist b/okteto.yml.dist index 80c34ea..b6ffbdb 100644 --- a/okteto.yml.dist +++ b/okteto.yml.dist @@ -1,4 +1,4 @@ -name: main-core-manifest-service +name: main-core-ui-middleware image: node:17-alpine command: ["sh", "okteto-entrypoint.sh"] workdir: /app diff --git a/package.json b/package.json index 1ee28d5..1aaa971 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "manifest-service", - "version": "1.1.0", + "name": "@open-xchange/ui-middleware", + "version": "1.0.0", "description": "Provides a combined manifest.json", "type": "module", "main": "src/index.js", diff --git a/spec/file-depencies_test.js b/spec/file-depencies_test.js index f3b4f21..e894988 100644 --- a/spec/file-depencies_test.js +++ b/spec/file-depencies_test.js @@ -53,6 +53,6 @@ describe('JS files with dependencies contain events', () => { const response = await request(app).get('/index.html.js') expect(response.statusCode).toBe(200) expect(response.headers.dependencies).toEqual('main.css') - expect(response.text).toEqual('console.log("this is index.html.js")\n/*injected by manifest-service*/document.dispatchEvent(new CustomEvent("load-css",{detail:{css:["main.css"]}}))') + expect(response.text).toEqual('console.log("this is index.html.js")\n/*injected by ui-middleware*/document.dispatchEvent(new CustomEvent("load-css",{detail:{css:["main.css"]}}))') }) }) diff --git a/spec/meta_test.js b/spec/meta_test.js index 42b6f1c..611425c 100644 --- a/spec/meta_test.js +++ b/spec/meta_test.js @@ -50,8 +50,8 @@ describe('Responses contain custom headers', () => { const response = await request(app).get('/meta') expect(response.statusCode).toBe(200) expect(response.body).toContainEqual({ - id: 'manifest-service', - name: 'Manifest Service', + id: 'ui-middleware', + name: 'UI Middleware', buildDate: '0123456789', commitSha: '0123456789abcdef', version: '4.2' diff --git a/spec/server_test.js b/spec/server_test.js index 662b28b..752856f 100644 --- a/spec/server_test.js +++ b/spec/server_test.js @@ -4,7 +4,7 @@ import request from 'supertest' import { createApp } from '../src/createApp' import { createMockServer, generateSimpleViteManifest, getRandomPort } from './util.js' -describe('Manifest service', () => { +describe('UI Middleware', () => { let app let mockserver, mockserver2 const port = getRandomPort() diff --git a/src/files.js b/src/files.js index 5296433..c264499 100644 --- a/src/files.js +++ b/src/files.js @@ -57,7 +57,7 @@ class FileCache { let appendix if (manifest.css && isJSFile(file)) { const cssString = manifest.css.map(file => `"${file}"`).join(',') - appendix = `\n/*injected by manifest-service*/document.dispatchEvent(new CustomEvent("load-css",{detail:{css:[${cssString}]}}))` + appendix = `\n/*injected by ui-middleware*/document.dispatchEvent(new CustomEvent("load-css",{detail:{css:[${cssString}]}}))` } return await fetchData(file, manifest.meta.baseUrl, appendix) } catch (e) { diff --git a/src/index.js b/src/index.js index 7aa62a1..5f45f39 100644 --- a/src/index.js +++ b/src/index.js @@ -12,7 +12,7 @@ const app = createApp() // Binds and listens for connections on the specified host and port root.listen(process.env.PORT, () => { - logger.info(`manifest-service listening on port ${process.env.PORT}`) + logger.info(`ui-middleware listening on port ${process.env.PORT}`) }) process.on('uncaughtException', err => { diff --git a/src/meta.js b/src/meta.js index 1cdd7c0..f14ec34 100644 --- a/src/meta.js +++ b/src/meta.js @@ -13,8 +13,8 @@ export async function getMergedMetadata () { } })) metadata.push({ - id: 'manifest-service', - name: 'Manifest Service', + id: 'ui-middleware', + name: 'UI Middleware', buildDate: process.env.BUILD_TIMESTAMP, commitSha: process.env.CI_COMMIT_SHA, version: process.env.APP_VERSION diff --git a/src/swagger.yaml b/src/swagger.yaml index 975d5f4..dc6a68c 100644 --- a/src/swagger.yaml +++ b/src/swagger.yaml @@ -4,7 +4,7 @@ tags: servers: - url: 'http://localhost:3000' info: - title: Manifest Service + title: UI Middleware version: 1.0.0 description: Micro service that collects manifest files from different services and merge them into a single file contact: @@ -16,7 +16,7 @@ paths: tags: - code loading summary: App Suite UI compatible version of manifests data - description: + description: Manifest data prepared for consumption by App Suite UI. The data can be used to determine the timing when to load certain files from the server and depending on the users configuration also if @@ -66,7 +66,7 @@ paths: tags: - code loading summary: Mapping of all files to all of its dependencies - description: + description: The data can be used to construct a dependency tree for any given file of a project. responses: '200': -- GitLab