@toa.io/operations 0.8.0-dev.0 → 0.20.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/operations",
-  "version": "0.8.0-dev.0",
+  "version": "0.20.0-alpha.0",
   "description": "Toa Deployment",
   "homepage": "https://toa.io",
   "author": {
@@ -22,14 +22,15 @@
     "access": "public"
   },
   "main": "src/index.js",
+  "types": "types/index.d.ts",
   "scripts": {
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/filesystem": "1.1.0-dev.2",
-    "@toa.io/generic": "0.11.0-dev.16",
-    "@toa.io/yaml": "0.7.6-dev.16",
+    "@toa.io/filesystem": "0.20.0-alpha.0",
+    "@toa.io/generic": "0.20.0-alpha.0",
+    "@toa.io/yaml": "0.20.0-alpha.0",
     "execa": "5.1.1"
   },
-  "gitHead": "669be360acebac4dbe49735ec506127d9d0a05e3"
+  "gitHead": "d047190899218b5249901a01a2a4caec5b34cf09"
 }

package/readme.md

@@ -0,0 +1,42 @@
+# Toa Operations
+
+## Context
+
+### Container Registry
+
+#### Build Options
+
+```yaml
+# context.toa.yaml
+
+registry:
+  build:
+    arguments: [GITHUB_TOKEN]
+    run: npm config set //npm.pkg.github.com/:_authToken ${GITHUB_TOKEN}
+```
+
+`arguments` is a list of environemt varialbes to be passed to `docker build`.
+
+`run` is a command(s) to be executed during build. Multiline is supported.
+
+```yaml
+# context.toa.yaml
+
+registry:
+  build:
+    run: |
+      echo test > .test
+      rm .test
+```
+
+#### Registry Credentials
+
+When using private container registry,
+a secret containing required credentials can be specified using `registry.credentials` option.
+
+```yaml
+# context.toa.yaml
+
+registry:
+  credentials: docker-credentials-secret-name
+```

package/src/deployment/.deployment/.describe/components.js

@@ -16,4 +16,5 @@ const components = (compositions) => {
 
   return Array.from(components)
 }
+
 exports.components = components

package/src/deployment/.deployment/.describe/compositions.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const { addVariables } = require('./variables')
+
+function compositions (compositions, variables) {
+  for (const composition of compositions) {
+    addVariables(composition, variables)
+  }
+}
+
+exports.compositions = compositions

package/src/deployment/.deployment/.describe/index.js

@@ -2,8 +2,12 @@
 
 const { dependencies } = require('./dependencies')
 const { components } = require('./components')
+const { compositions } = require('./compositions')
 const { variables } = require('./variables')
+const { services } = require('./services')
 
 exports.dependencies = dependencies
 exports.components = components
+exports.compositions = compositions
 exports.variables = variables
+exports.services = services

package/src/deployment/.deployment/.describe/services.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const { addVariables } = require('./variables')
+
+function services (services, variables) {
+  for (const service of services) {
+    addVariables(service, variables)
+  }
+}
+
+exports.services = services

package/src/deployment/.deployment/.describe/variables.js

@@ -1,20 +1,20 @@
 'use strict'
 
-/**
- * @param {toa.norm.Context} context
- * @param {toa.deployment.dependency.Variables} variables
- * @returns {toa.deployment.dependency.Variables}
- */
-const variables = (context, variables) => {
-  if (variables.global === undefined) variables.global = []
+function addVariables (deployment, variables) {
+  const used = new Set()
 
-  if (context.environment !== undefined) {
-    const variable = { name: 'TOA_ENV', value: context.environment }
+  deployment.variables ??= []
 
-    variables.global.unshift(variable)
-  }
+  for (const [key, set] of Object.entries(variables)) {
+    if (key !== 'global' && !deployment.components?.includes(key)) continue
+
+    for (const variable of set) {
+      if (used.has(variable.name)) continue
 
-  return variables
+      deployment.variables.push(variable)
+      used.add(variable.name)
+    }
+  }
 }
 
-exports.variables = variables
+exports.addVariables = addVariables

package/src/deployment/.deployment/describe.js

@@ -2,26 +2,23 @@
 
 const get = require('./.describe')
 
-/**
- * @param {toa.norm.Context} context
- * @param {toa.deployment.Composition[]} compositions
- * @param {toa.deployment.Dependency} dependency
- * @returns {toa.deployment.Contents}
- */
 const describe = (context, compositions, dependency) => {
-  const { references, services, proxies } = dependency
+  const { services } = dependency
+
+  dependency.variables.global ??= []
+  dependency.variables.global.unshift({ name: 'TOA_ENV', value: context.environment })
 
   const components = get.components(compositions)
-  const dependencies = get.dependencies(references)
-  const variables = get.variables(context, dependency.variables)
+  const credentials = context.registry?.credentials
+
+  get.compositions(compositions, dependency.variables, context.environment)
+  get.services(services, dependency.variables)
 
   return {
     compositions,
     components,
     services,
-    proxies,
-    variables,
-    ...dependencies
+    credentials,
   }
 }
 

package/src/deployment/.deployment/merge.js

@@ -1,9 +1,5 @@
 'use strict'
 
-/**
- * @param {toa.deployment.Dependency[]} dependencies
- * @returns {toa.deployment.Dependency}
- */
 const merge = (dependencies) => {
   /** @type {toa.deployment.dependency.Reference[]} */
   const references = []
@@ -27,10 +23,6 @@ const merge = (dependencies) => {
   return { references, services, proxies, variables }
 }
 
-/**
- * @param {toa.deployment.dependency.Variables} merged
- * @param {toa.deployment.dependency.Variables} variables
- */
 const append = (merged, variables) => {
   for (const [component, vars] of Object.entries(variables)) {
     if (merged[component] === undefined) merged[component] = []

package/src/deployment/chart/templates/compositions.yaml

@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: composition-{{ required "deployment name is required" .name }}
+  name: composition-{{ required "composition name is required" .name }}
 spec:
   replicas: {{ .replicas | default 2 }}
   selector:
@@ -19,20 +19,15 @@ spec:
       containers:
         - name: {{ .name }}
           image: {{ .image }}
-          {{- if $.Values.variables }}
+          {{- if .variables }}
           env:
-            {{- range $component := .components }}
-              {{- range $key, $vars := $.Values.variables }}
-                {{- if eq $component $key }}
-                  {{- range $vars }}
-                  {{- include "env.var" . | indent 12 }}
-                  {{- end }}
-                {{- end }}
-              {{- end }}
-            {{- end }}
-            {{- range $.Values.variables.global }}
+            {{- range .variables }}
             {{- include "env.var" . | indent 12 }}
             {{- end }}
           {{- end }}
+      {{- if $.Values.credentials }}
+      imagePullSecrets:
+        - name: {{ $.Values.credentials }}
+      {{- end }}
 ---
 {{- end }}

package/src/deployment/chart/templates/services.yaml

@@ -2,23 +2,23 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: service-{{ required "deployment name is required" .name }}
+  name: extension-{{ required "deployment name is required" .name }}
 spec:
   replicas: {{ .replicas | default 2 }}
   selector:
     matchLabels:
-      toa.io/service: {{ .name }}
+      toa.io/service: extension-{{ .name }}
   template:
     metadata:
       labels:
-        toa.io/service: {{ .name }}
+        toa.io/service: extension-{{ .name }}
     spec:
       containers:
-        - name: {{ .name }}
+        - name: extension-{{ .name }}
           image: {{ .image }}
-          {{- if $.Values.variables }}
+          {{- if .variables }}
           env:
-            {{- range $.Values.variables.global }}
+            {{- range .variables }}
             {{- include "env.var" . | indent 12 }}
             {{- end }}
           {{- end }}
@@ -26,11 +26,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: service-{{ .name }}
+  name: extension-{{ .name }}
 spec:
   type: ClusterIP
   selector:
-    toa.io/service: {{ .name }}
+    toa.io/service: extension-{{ .name }}
   ports:
     - name: port-{{ .port }}
       protocol: TCP
@@ -41,7 +41,7 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ .name }}
+  name: extension-{{ .name }}
   {{- if .ingress.annotations }}
   annotations:
 {{ toYaml .ingress.annotations | indent 4 }}
@@ -58,7 +58,7 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: service-{{ .name }}
+                name: extension-{{ .name }}
                 port:
                   number: 8000
 {{- end }}

package/src/deployment/chart/values.yaml

@@ -6,6 +6,12 @@ compositions:
     components:
       - todos-tasks
       - todos-stats
+    variables:
+      - name: TOA_CONFIGURATION_TODOS_TASKS
+        value: foo
+        secret:
+          name: secret-name
+          key: secret-key
   - name: users
     image: localhost:5000/composition-users:0.0.0
     replicas: 3
@@ -16,19 +22,6 @@ components:
   - todos-tasks
   - todos-stats
   - users-users
-variables:
-  global:
-    - name: TOA_BINDINGS_AMQP_SYSTEM_USERNAME
-      value: foo
-      secret:
-        name: secret-name
-        key: secret-key
-  todos-tasks:
-    - name: TOA_CONFIGURATION_TODOS_TASKS
-      value: foo
-      secret:
-        name: secret-name
-        key: secret-key
 services:
   - name: resources-gateway
     image: localhost:5000/resources-gateway:0.0.0
@@ -41,7 +34,14 @@ services:
         alb.ingress.kubernetes.io/scheme: internet-facing
         alb.ingress.kubernetes.io/target-type: ip
         alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS": 443}]'
+    variables:
+      - name: TOA_CONFIGURATION_TODOS_TASKS
+        value: foo
+        secret:
+          name: secret-name
+          key: secret-key
 proxies:
   - name: storage-proxy
     target: host.docker.internal
 environment: development
+credentials: docker-credentials

package/src/deployment/composition.js

@@ -1,19 +1,11 @@
 'use strict'
 
-// noinspection JSClosureCompilerSyntax
-/**
- * @implements {toa.deployment.Composition}
- */
 class Composition {
   name
   image
   /** @type {string[]} */
   components
 
-  /**
-   * @param composition {toa.norm.context.Composition}
-   * @param image {toa.deployment.images.Image}
-   */
   constructor (composition, image) {
     this.name = composition.name
     this.image = image.reference
@@ -21,10 +13,6 @@ class Composition {
   }
 }
 
-/**
- * @param {toa.norm.Component} component
- * @returns {string}
- */
 const component = (component) => component.locator.label
 
 exports.Composition = Composition

package/src/deployment/deployment.js

@@ -7,39 +7,23 @@ const { dump } = require('@toa.io/yaml')
 
 const { merge, declare, describe } = require('./.deployment')
 
-/**
- * @implements {toa.deployment.Deployment}
- */
 class Deployment {
-  /** @type {toa.deployment.Declaration} */
-  #declaration
-
-  /** @type {toa.deployment.Contents} */
-  #contents
-
-  /** @type {toa.operations.Process} */
+  #chart
+  #values
   #process
-
-  /** @type {string} */
   #target
 
-  /**
-   * @param context {toa.norm.Context}
-   * @param compositions {toa.deployment.Composition[]}
-   * @param dependencies {toa.deployment.Dependency[]}
-   * @param process {toa.operations.Process}
-   */
   constructor (context, compositions, dependencies, process) {
     const dependency = merge(dependencies)
 
-    this.#declaration = declare(context, dependency)
-    this.#contents = describe(context, compositions, dependency)
+    this.#chart = declare(context, dependency)
+    this.#values = describe(context, compositions, dependency)
     this.#process = process
   }
 
   async export (target) {
-    const chart = dump(this.#declaration)
-    const values = dump(this.#contents)
+    const chart = dump(this.#chart)
+    const values = dump(this.#values)
 
     await Promise.all([
       write(join(target, 'Chart.yaml'), chart),
@@ -60,7 +44,7 @@ class Deployment {
     if (options.wait === true) args.push('--wait')
 
     await this.#process.execute('helm', ['dependency', 'update', this.#target])
-    await this.#process.execute('helm', ['upgrade', this.#declaration.name, '-i', ...args, this.#target])
+    await this.#process.execute('helm', ['upgrade', this.#chart.name, '-i', ...args, this.#target])
   }
 
   async template (options) {
@@ -73,12 +57,31 @@ class Deployment {
     if (options.namespace !== undefined) args.push('-n', options.namespace)
 
     return await this.#process.execute('helm',
-      ['template', this.#declaration.name, ...args, this.#target],
+      ['template', this.#chart.name, ...args, this.#target],
       { silently: true })
   }
 
   variables () {
-    return this.#contents.variables
+    const variables = []
+    const used = new Set()
+
+    addVariables(this.#values.compositions, variables, used)
+    addVariables(this.#values.services, variables, used)
+
+    return variables
+  }
+}
+
+function addVariables (list, variables, used = new Set()) {
+  for (const item of list) {
+    if (item.variables === undefined) continue
+
+    for (const variable of item.variables) {
+      if (used.has(variable.name)) continue
+
+      variables.push(variable)
+      used.add(variable.name)
+    }
   }
 }
 

package/src/deployment/factory.js

@@ -8,33 +8,19 @@ const { Registry } = require('./registry')
 const { Composition } = require('./composition')
 const { Service } = require('./service')
 
-/**
- * @implements {toa.deployment.Factory}
- */
 class Factory {
-  /** @type {toa.norm.Context} */
   #context
-
-  /** @type {Composition[]} */
   #compositions
-
-  /** @type {toa.deployment.Dependency[]} */
   #dependencies
-
-  /** @type {toa.deployment.Registry} */
   #registry
-
-  /** @type {toa.operations.Process} */
   #process
+  #extensionComponents = []
 
-  /**
-   * @param context {toa.norm.Context}
-   */
   constructor (context) {
     this.#context = context
     this.#process = new Process()
 
-    const imagesFactory = new ImagesFactory(context.name, context.runtime)
+    const imagesFactory = new ImagesFactory(context.name, context.runtime, context.registry)
 
     this.#registry = new Registry(context.registry, imagesFactory, this.#process)
     this.#compositions = context.compositions.map((composition) => this.#composition(composition))
@@ -51,19 +37,12 @@ class Factory {
     return this.#registry
   }
 
-  /**
-   * @param composition {toa.norm.context.Composition}
-   * @returns {Composition}
-   */
   #composition (composition) {
     const image = this.#registry.composition(composition)
 
     return new Composition(composition, image)
   }
 
-  /**
-   * @returns {toa.deployment.Dependency[]}
-   */
   #getDependencies () {
     /** @type {toa.deployment.Dependency[]} */
     const dependencies = []
@@ -79,21 +58,16 @@ class Factory {
     return dependencies
   }
 
-  /**
-   * @param {string} path
-   * @param {toa.norm.context.dependencies.Instance[]} instances
-   * @returns {toa.deployment.Dependency | undefined}
-   */
   #getDependency (path, instances) {
     const module = require(path)
     const pkg = require(path + '/package.json')
 
     if (module.deployment === undefined) return
 
-    const annotations = this.#context.annotations?.[pkg.name]
+    const annotation = this.#context.annotations?.[pkg.name]
 
     /** @type {toa.deployment.dependency.Declaration} */
-    const dependency = module.deployment(instances, annotations)
+    const dependency = module.deployment(instances, annotation)
 
     /** @type {toa.deployment.Service[]} */
     const services = dependency.services?.map((service) => this.#service(path, service))

package/src/deployment/images/composition.Dockerfile

@@ -1,14 +1,19 @@
 FROM node:18.16.0-alpine3.17
 
+{{build.arguments}}
+
 ENV NODE_ENV=production
-RUN if [ {{registry}} != undefined ]; then npm set registry {{registry}}; fi
-RUN if [ {{proxy}} != undefined ]; then npm set proxy {{proxy}}; fi
-RUN npm i -g @toa.io/runtime@{{version}}
+RUN if [ "{{runtime.registry}}" != "" ]; then npm set registry {{runtime.registry}}; fi
+RUN if [ "{{runtime.proxy}}" != "" ]; then npm set proxy {{runtime.proxy}}; fi
+RUN npm i -g @toa.io/runtime@{{runtime.version}} --omit=dev
 
 WORKDIR /composition
-ADD . .
+COPY --chown=node:node . /composition
+
+{{build.run}}
 
 # run 'npm i' in each component
-RUN find . -maxdepth 1 -type d \( ! -name . \) -exec /bin/sh -c "cd '{}' && if [ -f package.json ]; then npm i; fi" \;
+RUN for entry in *; do if [ -f "$entry/package.json" ]; then (cd $entry && npm i --omit=dev); fi; done
 
+USER node
 CMD toa compose *

package/src/deployment/images/composition.js

@@ -11,23 +11,25 @@ class Composition extends Image {
 
   /** @type {string} */
   #name
+
   /** @type {toa.norm.Component[]} */
   #components
 
   /**
-   * @param scope {string}
-   * @param runtime {toa.norm.context.Runtime}
-   * @param composition {toa.norm.context.Composition}
+   * @param {string} scope
+   * @param {toa.norm.context.Runtime} runtime
+   * @param {toa.norm.context.Registry} registry
+   * @param {toa.norm.context.Composition} composition
    */
-  constructor (scope, runtime, composition) {
-    super(scope, runtime)
+  constructor (scope, runtime, registry, composition) {
+    super(scope, runtime, registry)
 
     this.#name = composition.name
     this.#components = composition.components
   }
 
   get name () {
-    return this.#name
+    return 'composition-' + this.#name
   }
 
   get version () {

package/src/deployment/images/factory.js

@@ -9,30 +9,44 @@ const { Service } = require('./service')
 class Factory {
   /** @type {string} */
   #scope
+
   /** @type {toa.norm.context.Runtime} */
   #runtime
 
+  /** @type {toa.norm.context.Registry} */
+  #registry
+
   /**
-   * @param scope {string}
-   * @param runtime {toa.norm.context.Runtime}
+   * @param {string} scope
+   * @param {toa.norm.context.Runtime} runtime
+   * @param {toa.norm.context.Registry} registry
    */
-  constructor (scope, runtime) {
+  constructor (scope, runtime, registry) {
     this.#scope = scope
     this.#runtime = runtime
+    this.#registry = registry
   }
 
   /**
    * @returns {Composition}
    */
   composition (composition) {
-    return new Composition(this.#scope, this.#runtime, composition)
+    const instance = new Composition(this.#scope, this.#runtime, this.#registry, composition)
+
+    instance.tag()
+
+    return instance
   }
 
   /**
    * @returns {Service}
    */
   service (path, service) {
-    return new Service(this.#scope, this.#runtime, path, service)
+    const instance = new Service(this.#scope, this.#runtime, this.#registry, path, service)
+
+    instance.tag()
+
+    return instance
   }
 }
 

package/src/deployment/images/image.fixtures.js

@@ -25,9 +25,15 @@ const runtime = {
   version: generate()
 }
 
+/** @type {toa.norm.context.Registry} */
+const registry = {
+  base: generate()
+}
+
 exports.scope = generate()
 exports.name = name
 exports.version = hash(runtime.version + ';' + version)
 exports.Class = Class
 exports.runtime = runtime
+exports.registry = registry
 exports.process = process

package/src/deployment/images/image.js

@@ -3,7 +3,7 @@
 const { join, posix } = require('node:path')
 const { readFile: read, writeFile: write } = require('node:fs/promises')
 
-const { hash } = require('@toa.io/generic')
+const { hash, overwrite } = require('@toa.io/generic')
 const { directory } = require('@toa.io/filesystem')
 
 /**
@@ -22,19 +22,33 @@ class Image {
 
   /** @type {string} */
   #scope
+
+  /** @type {toa.norm.context.Registry} */
+  #registry
+
   /** @type {toa.norm.context.Runtime} */
   #runtime
-  /** @type {string} */
-  #type
+
+  /** @type {{ runtime?: Partial<toa.norm.context.Runtime>, build: object }} */
+  #values = { build: { command: 'echo hello' } }
 
   /**
-   * @param scope {string}
-   * @param runtime {toa.norm.context.Runtime}
+   * @param {string} scope
+   * @param {toa.norm.context.Runtime} runtime
+   * @param {toa.norm.context.Registry} registry
    */
-  constructor (scope, runtime) {
+  constructor (scope, runtime, registry) {
     this.#scope = scope
+    this.#registry = registry
     this.#runtime = runtime
-    this.#type = this.constructor.name.toLowerCase()
+
+    this.#setValues()
+  }
+
+  tag () {
+    const tag = hash(this.#runtime?.version + ';' + this.version)
+
+    this.reference = posix.join(this.#registry.base ?? '', this.#scope, `${this.name}:${tag}`)
   }
 
   /**
@@ -51,21 +65,15 @@ class Image {
    */
   get version () {}
 
-  tag (base) {
-    const tag = hash(this.#runtime?.version + ';' + this.version)
-
-    this.reference = posix.join(base ?? '', this.#scope, `${this.#type}-${this.name}:${tag}`)
-  }
-
   async prepare (root) {
     if (this.dockerfile === undefined) throw new Error('Dockerfile isn\'t specified')
 
-    const path = join(root, `${this.#type}-${this.name}.${this.version}`)
+    const path = join(root, `${this.name}.${this.version}`)
 
     await directory.ensure(path)
 
     const template = await read(this.dockerfile, 'utf-8')
-    const contents = template.replace(/{{(\.?\w+)}}/g, (_, key) => this.#value(key))
+    const contents = template.replace(/{{(\S{1,32})}}/g, (_, key) => this.#value(key))
     const ignore = 'Dockerfile'
 
     await write(join(path, 'Dockerfile'), contents)
@@ -76,16 +84,44 @@ class Image {
     return path
   }
 
+  #setValues () {
+    this.#values.runtime = this.#runtime
+    this.#values.build = overwrite(this.#values.build, this.#registry.build)
+
+    if (this.#values.build.arguments !== undefined) this.#values.build.arguments = createArguments(this.#values.build.arguments)
+    if (this.#values.build.run !== undefined) this.#values.build.run = createRunCommands(this.#values.build.run)
+  }
+
   /**
    * @param key {string}
    * @returns {string}
    */
   #value (key) {
-    const [, property] = key.split('.')
+    const [source, property] = key.split('.')
+
+    return this.#values[source]?.[property] ?? ''
+  }
+}
 
-    if (property !== undefined) return this[property]
-    else return this.#runtime[key]
+function createRunCommands (input) {
+  const lines = input.split('\n')
+
+  return lines.reduce((commands, command) => {
+    commands += '\nRUN ' + command
+
+    return commands
+  }, '')
+}
+
+function createArguments (variables) {
+  const args = []
+
+  for (const variable of variables) {
+    args.push('ARG ' + variable)
+    args.push(`ENV ${variable}=$${variable}`)
   }
+
+  return args.join('\n')
 }
 
 exports.Image = Image

package/src/deployment/images/image.test.js

@@ -7,15 +7,13 @@ const { generate } = require('randomstring')
 let instance
 
 beforeEach(() => {
-  instance = new fixtures.Class(fixtures.scope, fixtures.runtime)
+  instance = new fixtures.Class(fixtures.scope, fixtures.runtime, fixtures.registry)
 })
 
 it('should assign url', () => {
-  const registry = generate()
+  instance.tag()
 
-  instance.tag(registry)
-
-  expect(instance.reference).toEqual(`${registry}/${fixtures.scope}/class-${fixtures.name}:${fixtures.version}`)
+  expect(instance.reference).toEqual(`${fixtures.registry.base}/${fixtures.scope}/${fixtures.name}:${fixtures.version}`)
 })
 
 describe('prepare', () => {

package/src/deployment/images/service.Dockerfile

@@ -1,12 +1,14 @@
 FROM node:18.16.0-alpine3.17
 
 ENV NODE_ENV=production
-RUN if [ {{registry}} != undefined ]; then npm set registry {{registry}}; fi
-RUN if [ {{proxy}} != undefined ]; then npm set proxy {{proxy}}; fi
-RUN npm i -g @toa.io/runtime@{{version}}
+RUN if [ "{{runtime.registry}}" != "" ]; then npm set registry {{runtime.registry}}; fi
+RUN if [ "{{runtime.proxy}}" != "" ]; then npm set proxy {{runtime.proxy}}; fi
+RUN npm i -g @toa.io/runtime@{{runtime.version}} --omit=dev
 
 WORKDIR /service
-ADD . .
-RUN npm i
+COPY --chown=node:node . /service
 
+RUN npm i --omit=dev
+
+USER node
 CMD toa serve .

package/src/deployment/images/service.js

@@ -18,21 +18,25 @@ class Service extends Image {
 
   /** @type {string} */
   #group
+
   /** @type {string} */
   #name
+
   /** @type {string} */
   #path
+
   /** @type {string} */
   #version
 
   /**
    * @param {string} scope
    * @param {toa.norm.context.Runtime} runtime
+   * @param {toa.norm.context.Registry} registry
    * @param {string} reference
    * @param {toa.deployment.dependency.Service} service
    */
-  constructor (scope, runtime, reference, service) {
-    super(scope, runtime)
+  constructor (scope, runtime, registry, reference, service) {
+    super(scope, runtime, registry)
 
     this.service = service.name
 
@@ -43,7 +47,7 @@ class Service extends Image {
   }
 
   get name () {
-    return this.#group + '-' + this.#name
+    return 'extension-' + this.#group + '-' + this.#name
   }
 
   get version () {

package/src/deployment/operator.js

@@ -2,9 +2,6 @@
 
 const workspace = require('./workspace')
 
-/**
- * @implements {toa.deployment.Operator}
- */
 class Operator {
   /** @type {toa.deployment.Deployment} */
   #deployment

package/src/deployment/registry.js

@@ -65,7 +65,6 @@ class Registry {
   #create (type, ...args) {
     const image = this.#factory[type](...args)
 
-    image.tag(this.#registry?.base)
     this.#images.push(image)
 
     return image
@@ -85,6 +84,10 @@ class Registry {
 
     const multiarch = this.#registry.platforms !== null
 
+    if (this.#registry.build?.arguments !== undefined) {
+      for (const arg of this.#registry.build.arguments) args.push('--build-arg', `${arg}=${process.env[arg]}`)
+    }
+
     if (multiarch) {
       const platform = this.#registry.platforms.join(',')
 

package/src/deployment/service.js

@@ -1,24 +1,11 @@
 'use strict'
 
-// noinspection JSClosureCompilerSyntax
-/**
- * @implements {toa.deployment.Service}
- */
 class Service {
-  name
-  image
-  port
-  ingress
-
-  /**
-   * @param service {toa.deployment.dependency.Service}
-   * @param image {toa.deployment.images.Image}
-   */
   constructor (service, image) {
+    Object.assign(this, service)
+
     this.name = service.group + '-' + service.name
-    this.port = service.port
     this.image = image.reference
-    this.ingress = service.ingress
   }
 }
 

package/types/_deployment/images/image.d.ts

@@ -0,0 +1,14 @@
+declare namespace toa.deployment.images {
+
+  export interface Image {
+    readonly reference: string
+    readonly context: string
+
+    tag(): void
+
+    prepare(root: string): Promise<string>
+  }
+
+}
+
+export type Image = toa.deployment.images.Image

package/types/_deployment/operator.d.ts

@@ -0,0 +1,20 @@
+import * as _deployment from './deployment'
+import * as _dependency from './dependency'
+
+declare namespace toa.deployment {
+
+  interface Operator {
+    export (path?: string): Promise<string>
+
+    install (options?: _deployment.installation.Options): Promise<void>
+
+    template (options?: _deployment.template.Options): Promise<string>
+
+    variables (): _dependency.Variables
+
+    listVariables (): _dependency.Variable[]
+  }
+
+}
+
+export type Operator = toa.deployment.Operator

package/types/{deployment → _deployment}/registry.d.ts

@@ -3,7 +3,7 @@ import type * as _dependency from './dependency'
 import type * as _image from "./images/image"
 
 declare namespace toa.deployment {
-
+  
   interface Registry {
     composition(composition: _norm.Composition): _image.Image
 

package/types/dependency.d.ts

@@ -0,0 +1,29 @@
+export type Service = {
+  group: string
+  name: string
+  version: string
+  port: number
+  ingress?: {
+    host: string
+    class?: string
+    annotations?: object
+  }
+  variables: Variable[]
+  components?: string[]
+}
+
+export type Variable = {
+  name: string
+  value?: string
+  secret?: {
+    name: string,
+    key: string
+  }
+}
+
+export type Variables = Record<string, Variable[]>
+
+export type Dependency = {
+  services?: Service[]
+  variables?: Variables
+}

package/types/index.d.ts

@@ -0,0 +1 @@
+export * from './dependency'

package/src/deployment/chart/templates/proxies.yaml

@@ -1,10 +0,0 @@
-{{- range .Values.proxies }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .name }}
-spec:
-  type: ExternalName
-  externalName: {{ .target }}
----
-{{- end }}

package/src/deployment/deployment.fixtures.js

@@ -1,42 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-
-const context = /** @type {toa.norm.Context} */ { name: generate() }
-const compositions = []
-/** @type {toa.deployment.Dependency[]} */
-
-/** @type {toa.deployment.dependency.Variable} */
-const bindingVariable = {
-  name: 'TOA_BINDINGS_AMQP_POINTER',
-  value: 'eyJkZWZhdWx0IjoiYW1xcDovL3doYXRldmVyIiwic3lzdGVtIjoiYW1xcDovL2hvc3QwIn0='
-}
-
-/** @type {toa.deployment.dependency.Variable} */
-const secretVariable = {
-  name: 'TOA_BINDINGS_AMQP_DEFAULT_USERNAME',
-  secret: {
-    name: 'toa-bindings-amqp-default',
-    key: 'username'
-  }
-}
-
-/** @type {toa.deployment.Dependency[]} */
-const dependencies = [{
-  variables: { global: [bindingVariable, secretVariable] }
-}]
-
-const process = /** @type {toa.operations.Process} */ { execute: jest.fn() }
-
-const options = /** @type {toa.deployment.installation.Options} */ {
-  namespace: generate(),
-  target: generate()
-}
-
-exports.context = context
-exports.compositions = compositions
-exports.dependencies = dependencies
-exports.process = process
-exports.options = options
-exports.bindingVariable = bindingVariable
-exports.secretVariable = secretVariable

package/src/deployment/deployment.test.js

@@ -1,78 +0,0 @@
-'use strict'
-
-const clone = require('clone-deep')
-
-const fixtures = require('./deployment.fixtures')
-const { Deployment } = require('../../src/deployment/deployment')
-
-/** @type {toa.deployment.Deployment} */
-let deployment
-/** @type {toa.deployment.installation.Options} */
-let options
-
-beforeEach(() => {
-  deployment = new Deployment(fixtures.context, fixtures.compositions, fixtures.dependencies, fixtures.process)
-  options = clone(fixtures.options)
-})
-
-it('should pass -n argument if options.namespace is set', async () => {
-  await deployment.install(options)
-
-  const call = fixtures.process.execute.mock.calls.find((call) => call[0] === 'helm' && call[1][0] === 'upgrade')
-
-  expect(call).toBeDefined()
-
-  const args = call[1]
-  const index = args.findIndex((value) => value === '-n')
-  const namespace = args[index + 1]
-
-  expect(index).not.toStrictEqual(-1)
-  expect(namespace).toStrictEqual(fixtures.options.namespace)
-})
-
-describe('variables', () => {
-  let deployment /** @type {toa.deployment.Deployment} */
-
-  it('should be define', () => {
-    const context = clone(fixtures.context)
-
-    deployment = new Deployment(context, fixtures.compositions, fixtures.dependencies, fixtures.process)
-
-    expect(typeof deployment.variables).toBe('function')
-  })
-
-  it('should return variables', () => {
-    const context = clone(fixtures.context)
-    const [{ variables }] = fixtures.dependencies
-
-    deployment = new Deployment(context, fixtures.compositions, fixtures.dependencies, fixtures.process)
-    expect(deployment.variables()).toEqual(variables)
-  })
-
-  it('should return variables', () => {
-    const context = clone(fixtures.context)
-    const [{ variables }] = fixtures.dependencies
-
-    deployment = new Deployment(context, fixtures.compositions, fixtures.dependencies, fixtures.process)
-
-    expect(deployment.variables()).toEqual(variables)
-  })
-
-  it('should merge all variables', () => {
-    const context = clone(fixtures.context)
-
-    /** @type {toa.deployment.Dependency} */
-    const dep1 = { variables: { global: [fixtures.secretVariable] } }
-
-    /** @type {toa.deployment.Dependency} */
-    const dep2 = { variables: { global: [fixtures.bindingVariable] } }
-
-    deployment = new Deployment(context, fixtures.compositions, [dep1, dep2], fixtures.process)
-
-    const result = deployment.variables()
-    const expectedVariables = [fixtures.bindingVariable, fixtures.secretVariable]
-
-    expect(result.global.length).toBe(expectedVariables.length)
-    expect(result.global).toStrictEqual(expect.arrayContaining(expectedVariables))
-  })
-})

package/types/deployment/images/image.d.ts

@@ -1,14 +0,0 @@
-declare namespace toa.deployment.images {
-
-    export interface Image {
-        readonly reference: string
-        readonly context: string
-
-        tag(base: string): void
-
-        prepare(root: string): Promise<string>
-    }
-
-}
-
-export type Image = toa.deployment.images.Image

package/types/deployment/operator.d.ts

@@ -1,18 +0,0 @@
-import * as _deployment from './deployment'
-import * as _dependency from './dependency'
-
-declare namespace toa.deployment {
-
-  interface Operator {
-    export(path?: string): Promise<string>
-
-    install(options?: _deployment.installation.Options): Promise<void>
-
-    template(options?: _deployment.template.Options): Promise<string>
-
-    variables(): _dependency.Variables
-  }
-
-}
-
-export type Operator = toa.deployment.Operator

package/types/process.d.ts

@@ -1,13 +0,0 @@
-declare namespace toa.operations {
-
-    namespace process {
-        interface Options {
-            silently?: boolean
-        }
-    }
-
-    interface Process {
-        execute(cmd: string, args: Array<string>, options?: process.Options): Promise<string>
-    }
-
-}