@toa.io/operations 1.0.0-alpha.6 → 1.0.0-alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/operations",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-alpha.8",
   "description": "Toa Deployment",
   "homepage": "https://toa.io",
   "author": {
@@ -27,12 +27,12 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/filesystem": "1.0.0-alpha.6",
-    "@toa.io/generic": "1.0.0-alpha.6",
-    "@toa.io/norm": "1.0.0-alpha.6",
-    "@toa.io/yaml": "1.0.0-alpha.6",
+    "@toa.io/filesystem": "1.0.0-alpha.8",
+    "@toa.io/generic": "1.0.0-alpha.8",
+    "@toa.io/norm": "1.0.0-alpha.8",
+    "@toa.io/yaml": "1.0.0-alpha.8",
     "execa": "5.1.1",
     "fs-extra": "11.1.1"
   },
-  "gitHead": "f28d629a9477646e267a8af8479cc1bb10d62c80"
+  "gitHead": "2ee18835c8214600e1d354251fa632913bff38c3"
 }

package/src/deployment/images/composition.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const { join } = require('node:path')
-const { hash } = require('@toa.io/generic')
 const fs = require('fs-extra')
+const { createHash } = require('node:crypto')
 
 const { Image } = require('./image')
 
@@ -26,22 +26,29 @@ class Composition extends Image {
   }
 
   get version () {
-    const tags = this.#components.map((component) => component.locator.id + ':' + component.version)
+    const hash = createHash('sha256')
 
-    return hash(tags.join(';'))
+    for (const component of this.#components) {
+      hash.update(component.locator.id)
+      hash.update(component.version)
+    }
+
+    return hash.digest('hex').slice(0, 8)
   }
 
   get base () {
-    if (this.#image !== undefined)
+    if (this.#image !== undefined) {
       return this.#image
+    }
 
     let image = null
 
     for (const component of this.#components) {
       const value = component.build?.image
 
-      if (image !== null && image !== value)
+      if (image !== null && image !== value) {
         throw new Error(`Composition '${this.#name}' requires different base images for its components. Specify base image for the composition in the context.`)
+      }
 
       image = value
     }

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

@@ -2,9 +2,8 @@
 
 const { Image } = require('./image')
 const { generate } = require('randomstring')
-const { hash } = require('@toa.io/generic')
 
-const version = generate()
+const version = '168b04ff'
 const name = generate()
 
 /**
@@ -22,17 +21,17 @@ class Class extends Image {
 
 /** @type {toa.norm.context.Runtime} */
 const runtime = {
-  version: generate()
+  version: '0.0.0'
 }
 
 /** @type {toa.norm.context.Registry} */
 const registry = {
-  base: generate()
+  base: 'node:alpine'
 }
 
 exports.scope = generate()
 exports.name = name
-exports.version = hash(runtime.version + ';' + version)
+exports.version = 'ba2409fc'
 exports.Class = Class
 exports.runtime = runtime
 exports.registry = registry

package/src/deployment/images/image.js

@@ -1,10 +1,17 @@
 'use strict'
 
-const { join, posix } = require('node:path')
-const { readFile: read, writeFile: write } = require('node:fs/promises')
-
-const { hash, overwrite } = require('@toa.io/generic')
-const fs = require('fs-extra')
+const {
+  join,
+  posix
+} = require('node:path')
+const {
+  readFile: read,
+  writeFile: write
+} = require('node:fs/promises')
+const { createHash } = require('node:crypto')
+
+const { overwrite } = require('@toa.io/generic')
+const { mkdir } = require('node:fs/promises')
 
 /**
  * @implements {toa.deployment.images.Image}
@@ -31,7 +38,12 @@ class Image {
   }
 
   tag () {
-    const tag = hash(this.#runtime?.version + ';' + this.version)
+    const hash = createHash('sha256')
+
+    hash.update(this.#runtime.version)
+    hash.update(this.version)
+
+    const tag = hash.digest('hex').slice(0, 8)
 
     this.reference = posix.join(this.#registry.base ?? '', this.#scope, `${this.name}:${tag}`)
   }
@@ -49,7 +61,7 @@ class Image {
 
     const path = join(root, `${this.name}.${this.version}`)
 
-    await fs.ensureDir(path)
+    await mkdir(path, { recursive: true })
 
     const template = await read(this.dockerfile, 'utf-8')
     const contents = template.replace(/{{(\S{1,32})}}/g, (_, key) => this.#value(key))
@@ -69,8 +81,9 @@ class Image {
 
     const image = this.base
 
-    if (image !== undefined)
+    if (image !== undefined) {
       this.#values.build.image = image
+    }
 
     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)

package/src/deployment/registry.js

@@ -39,7 +39,9 @@ class Registry {
   async build () {
     await this.prepare()
 
-    for (const image of this.#images) await this.#build(image)
+    for (const image of this.#images) {
+      await this.#build(image)
+    }
   }
 
   async push () {
@@ -69,7 +71,11 @@ class Registry {
   async #build (image, push = false) {
     const args = ['--context=default', 'buildx', 'build']
 
-    if (push) args.push('--push')
+    if (push) {
+      args.push('--push')
+    } else {
+      args.push('--load')
+    }
 
     args.push('--tag', image.reference, image.context)
 
@@ -86,7 +92,9 @@ class Registry {
       args.push('--builder', BUILDER)
 
       await this.#ensureBuilder()
-    } else args.push('--builder', 'default')
+    } else {
+      args.push('--builder', 'default')
+    }
 
     args.push('--progress', 'plain')