Update balena-compose-parse to 3.0.0

Update balena-compose-parse from 2.1.3 to 3.0.0 Changelog-entry: push/build/deploy: Support 'condition: service_started' in 'depends_on' service configuration in docker-compose.yml Change-type: minor Signed-off-by: Robert Günzler <[email protected]>
balena-io · Dec 1, 2021 · 208cbcb · 208cbcb
1 parent c125e0b
commit 208cbcb
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 49 deletions.
diff --git a/lib/commands/deploy.ts b/lib/commands/deploy.ts
@@ -16,7 +16,7 @@
  */
 
 import { flags } from '@oclif/command';
-import type { ImageDescriptor } from 'resin-compose-parse';
+import type { ImageDescriptor } from '@balena/compose-parse';
 
 import Command from '../command';
 import { ExpectedError } from '../errors';

diff --git a/lib/utils/compose-types.d.ts b/lib/utils/compose-types.d.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import type { Composition, ImageDescriptor } from 'resin-compose-parse';
+import type { Composition, ImageDescriptor } from '@balena/compose-parse';
 import type { Pack } from 'tar-stream';
 
 interface Image {

diff --git a/lib/utils/compose.js b/lib/utils/compose.js
@@ -60,7 +60,7 @@ export function createProject(
 	imageTag = '',
 ) {
 	const yml = require('js-yaml');
-	const compose = require('resin-compose-parse');
+	const compose = require('@balena/compose-parse');
 
 	// both methods below may throw.
 	const rawComposition = yml.load(composeStr);
@@ -180,7 +180,7 @@ export async function originalTarDirectory(dir, param) {
  * @param {string} auth
  * @param {number} userId
  * @param {number} appId
- * @param {import('resin-compose-parse').Composition} composition
+ * @param {import('@balena/compose-parse').Composition} composition
  * @param {boolean} draft
  * @param {string|undefined} semver
  * @param {string|undefined} contract

diff --git a/lib/utils/compose_ts.ts b/lib/utils/compose_ts.ts
@@ -26,7 +26,7 @@ import type {
 	BuildConfig,
 	Composition,
 	ImageDescriptor,
-} from 'resin-compose-parse';
+} from '@balena/compose-parse';
 import type * as MultiBuild from 'resin-multibuild';
 import type { Duplex, Readable } from 'stream';
 import type { Pack } from 'tar-stream';
@@ -120,7 +120,7 @@ export async function loadProject(
 	image?: string,
 	imageTag?: string,
 ): Promise<ComposeProject> {
-	const compose = await import('resin-compose-parse');
+	const compose = await import('@balena/compose-parse');
 	const { createProject } = await import('./compose');
 	let composeName: string;
 	let composeStr: string;
@@ -265,7 +265,7 @@ export async function buildProject(
 	opts: BuildProjectOpts,
 ): Promise<BuiltImage[]> {
 	await checkBuildSecretsRequirements(opts.docker, opts.projectPath);
-	const compose = await import('resin-compose-parse');
+	const compose = await import('@balena/compose-parse');
 	const imageDescriptors = compose.parse(opts.composition);
 	const renderer = await startRenderer({ imageDescriptors, ...opts });
 	let buildSummaryByService: Dictionary<string> | undefined;
@@ -727,16 +727,16 @@ export async function getServiceDirsFromComposition(
  *
  * The `image` argument may therefore refer to either a `build` or `image` property
  * of a service in a docker-compose.yml file, which is a bit confusing but it matches
- * the `ImageDescriptor.image` property as defined by `resin-compose-parse`.
+ * the `ImageDescriptor.image` property as defined by `@balena/compose-parse`.
  *
- * Note that `resin-compose-parse` "normalizes" the docker-compose.yml file such
+ * Note that `@balena/compose-parse` "normalizes" the docker-compose.yml file such
  * that, if `services.service.build` is a string, it is converted to a BuildConfig
  * object with the string value assigned to `services.service.build.context`:
- * https://github.com/balena-io-modules/resin-compose-parse/blob/v2.1.3/src/compose.ts#L166-L167
+ * https://github.com/balena-io-modules/balena-compose-parse/blob/v3.0.0/src/compose.ts#L314-L315
  * This is why this implementation works when `services.service.build` is defined
  * as a string in the docker-compose.yml file.
  *
- * @param image The `ImageDescriptor.image` attribute parsed with `resin-compose-parse`
+ * @param image The `ImageDescriptor.image` attribute parsed with `@balena/compose-parse`
  */
 export function isBuildConfig(
 	image: string | BuildConfig,

diff --git a/lib/utils/device/deploy.ts b/lib/utils/device/deploy.ts
@@ -18,7 +18,7 @@
 import * as semver from 'balena-semver';
 import * as Docker from 'dockerode';
 import * as _ from 'lodash';
-import { Composition } from 'resin-compose-parse';
+import { Composition } from '@balena/compose-parse';
 import {
 	BuildTask,
 	getAuthConfigObj,

diff --git a/lib/utils/device/live.ts b/lib/utils/device/live.ts
@@ -21,7 +21,7 @@ import * as fs from 'fs';
 import Livepush, { ContainerNotRunningError } from 'livepush';
 import * as _ from 'lodash';
 import * as path from 'path';
-import type { Composition } from 'resin-compose-parse';
+import type { Composition } from '@balena/compose-parse';
 import type { BuildTask } from 'resin-multibuild';
 
 import { instanceOf } from '../../errors';

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
       "node_modules/balena-sdk/es2018/index.js",
       "node_modules/balena-sync/build/**/*.js",
       "node_modules/pinejs-client-request/node_modules/pinejs-client-core/es2018/index.js",
-      "node_modules/resin-compose-parse/build/schemas/*.json"
+      "node_modules/@balena/compose-parse/build/schemas/*.json"
     ],
     "assets": [
       "build/auth/pages/*.ejs",
@@ -194,6 +194,7 @@
     "typescript": "^4.3.5"
   },
   "dependencies": {
+    "@balena/compose-parse": "^3.0.0",
     "@balena/dockerignore": "^1.0.2",
     "@balena/es-version": "^1.0.0",
     "@oclif/command": "^1.8.0",
@@ -209,7 +210,7 @@
     "balena-image-fs": "^7.0.6",
     "balena-image-manager": "^7.1.0",
     "balena-preload": "^11.0.0",
-    "balena-release": "^3.2.0",
+    "balena-release": "^3.3.0",
     "balena-sdk": "^15.51.1",
     "balena-semver": "^2.3.0",
     "balena-settings-client": "^4.0.7",
@@ -265,7 +266,6 @@
     "request": "^2.88.2",
     "resin-cli-form": "^2.0.2",
     "resin-cli-visuals": "^1.8.0",
-    "resin-compose-parse": "^2.1.3",
     "resin-doodles": "^0.1.1",
     "resin-multibuild": "^4.12.2",
     "resin-stream-logger": "^0.1.2",

diff --git a/repo.yml b/repo.yml
@@ -14,5 +14,5 @@ upstream:
     url: 'https://github.com/balena-io-modules/balena-sync'
   - repo: 'etcher-sdk'
     url: 'https://github.com/balena-io-modules/etcher-sdk/'
-  - repo: 'resin-compose-parse'
-    url: 'https://github.com/balena-io-modules/resin-compose-parse'
+  - repo: 'balena-compose-parse'
+    url: 'https://github.com/balena-io-modules/balena-compose-parse'
diff --git a/tests/utils/device/live.spec.ts b/tests/utils/device/live.spec.ts
@@ -79,7 +79,7 @@ describeSS('LivepushManager::setupFilesystemWatcher', function () {
 
 	async function createMonitors(
 		projectPath: string,
-		composition: import('resin-compose-parse').Composition,
+		composition: import('@balena/compose-parse').Composition,
 		multiDockerignore: boolean,
 		changedPathHandler: (serviceName: string, changedPath: string) => void,
 	): Promise<ByService<chokidar.FSWatcher>> {