@balena/open-balena-api 31.1.1 → 31.2.0-build-add-device-service-fks-9099156216b4ffb1e85f2dcd4475a760cb8da5c7-1

package/dist/balena-model.d.ts

@@ -598,6 +598,11 @@ export interface Service {
         service_install?: Array<ServiceInstall['Read']>;
         is_installed_on__device?: Array<ServiceInstall['Read']>;
         is_built_by__image?: Array<Image['Read']>;
+        is_of__device__installs__application__has__service_name__has__name?: Array<DeviceServiceEnvironmentVariable['Read']>;
+        is_of__device__installs__service__has__name?: Array<DeviceServiceEnvironmentVariable['Read']>;
+        is_of__device__installs__service_environment_variable?: Array<DeviceServiceEnvironmentVariable['Read']>;
+        is_of__service_install__has__name?: Array<DeviceServiceEnvironmentVariable['Read']>;
+        is_of__device_service_environment_variable?: Array<DeviceServiceEnvironmentVariable['Read']>;
     };
     Write: {
         created_at: Types['Date Time']['Write'];
@@ -757,6 +762,11 @@ export interface Device {
         installs__image?: Array<ImageInstall['Read']>;
         installs__application__has__service_name?: Array<ServiceInstall['Read']>;
         installs__service?: Array<ServiceInstall['Read']>;
+        is_of__device__installs__application__has__service_name__has__name?: Array<DeviceServiceEnvironmentVariable['Read']>;
+        is_of__device__installs__service__has__name?: Array<DeviceServiceEnvironmentVariable['Read']>;
+        is_of__device__installs__service_environment_variable?: Array<DeviceServiceEnvironmentVariable['Read']>;
+        is_of__service_install__has__name?: Array<DeviceServiceEnvironmentVariable['Read']>;
+        is_of__device_service_environment_variable?: Array<DeviceServiceEnvironmentVariable['Read']>;
     };
     Write: {
         created_at: Types['Date Time']['Write'];
@@ -929,12 +939,21 @@ export interface DeviceServiceEnvironmentVariable {
         name: Types['Short Text']['Read'];
         id: Types['Serial']['Read'];
         value: Types['Text']['Read'];
+        service: {
+            __id: Service['Read']['id'];
+        } | [Service['Read']] | [] | null;
+        device: {
+            __id: Device['Read']['id'];
+        } | [Device['Read']] | [] | null;
         device__installs__application__has__service_name: {
             __id: ServiceInstall['Read']['id'];
         } | [ServiceInstall['Read']];
         device__installs__service: {
             __id: ServiceInstall['Read']['id'];
         } | [ServiceInstall['Read']];
+        application__has__service_name: {
+            __id: Service['Read']['id'];
+        } | [Service['Read']] | [] | null;
     };
     Write: {
         created_at: Types['Date Time']['Write'];
@@ -943,6 +962,8 @@ export interface DeviceServiceEnvironmentVariable {
         name: Types['Short Text']['Write'];
         id: Types['Serial']['Write'];
         value: Types['Text']['Write'];
+        service: Service['Write']['id'] | null;
+        device: Device['Write']['id'] | null;
     };
 }
 export interface DeviceTag {

package/dist/balena.sbvr

@@ -812,6 +812,10 @@ Fact type: image environment variable has value
 
 Fact type: device service environment variable has value
 	Necessity: each device service environment variable has exactly one value.
+Fact type: device service environment variable has service
+	Necessity: each device service environment variable has at most one service.
+Fact type: device service environment variable has device
+	Necessity: each device service environment variable has at most one device.
 
 
 -- application tag

package/dist/features/ci-cd/hooks/backfill-device-service-environment-variable.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/features/ci-cd/hooks/backfill-device-service-environment-variable.js

@@ -0,0 +1,26 @@
+import { hooks, errors } from '@balena/pinejs';
+async function backfillDeviceAndService({ request, api, }) {
+    const { service_install: siId } = request.values;
+    if (siId == null) {
+        return;
+    }
+    const si = await api.get({
+        resource: 'service_install',
+        id: siId,
+        options: {
+            $select: ['device', 'service'],
+        },
+    });
+    if (si == null) {
+        throw new errors.NotFoundError(`Service install not found: ${siId}`);
+    }
+    request.values.device = si.device.__id;
+    request.values.service = si.service.__id;
+}
+hooks.addPureHook('POST', 'resin', 'device_service_environment_variable', {
+    POSTPARSE: backfillDeviceAndService,
+});
+hooks.addPureHook('PATCH', 'resin', 'device_service_environment_variable', {
+    POSTPARSE: backfillDeviceAndService,
+});
+//# sourceMappingURL=backfill-device-service-environment-variable.js.map

package/dist/features/ci-cd/hooks/backfill-device-service-environment-variable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backfill-device-service-environment-variable.js","sourceRoot":"","sources":["../../../../src/features/ci-cd/hooks/backfill-device-service-environment-variable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAkB,MAAM,gBAAgB,CAAC;AAE/D,KAAK,UAAU,wBAAwB,CAAC,EACvC,OAAO,EACP,GAAG,GAC0B;IAC7B,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAEjD,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO;IACR,CAAC;IAED,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC;QACxB,QAAQ,EAAE,iBAAiB;QAC3B,EAAE,EAAE,IAAI;QACR,OAAO,EAAE;YACR,OAAO,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;SAC9B;KACD,CAAC,CAAC;IAEH,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,MAAM,CAAC,aAAa,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;IACvC,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;AAC1C,CAAC;AAED,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,qCAAqC,EAAE;IACzE,SAAS,EAAE,wBAAwB;CACnC,CAAC,CAAC;AAEH,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,qCAAqC,EAAE;IAC1E,SAAS,EAAE,wBAAwB;CACnC,CAAC,CAAC"}

package/dist/features/ci-cd/hooks/index.d.ts

@@ -1,4 +1,5 @@
 import './app-update-trigger.js';
+import './backfill-device-service-environment-variable.js';
 import './device-update-trigger.js';
 import './image-is-stored-at-location.js';
 import './release-update-timestamp.js';

package/dist/features/ci-cd/hooks/index.js

@@ -1,4 +1,5 @@
 import './app-update-trigger.js';
+import './backfill-device-service-environment-variable.js';
 import './device-update-trigger.js';
 import './image-is-stored-at-location.js';
 import './release-update-timestamp.js';

package/dist/features/ci-cd/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/features/ci-cd/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,4BAA4B,CAAC;AACpC,OAAO,kCAAkC,CAAC;AAC1C,OAAO,+BAA+B,CAAC;AACvC,OAAO,yBAAyB,CAAC;AACjC,OAAO,uBAAuB,CAAC;AAC/B,OAAO,2BAA2B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/features/ci-cd/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,mDAAmD,CAAC;AAC3D,OAAO,4BAA4B,CAAC;AACpC,OAAO,kCAAkC,CAAC;AAC1C,OAAO,+BAA+B,CAAC;AACvC,OAAO,yBAAyB,CAAC;AACjC,OAAO,uBAAuB,CAAC;AAC/B,OAAO,2BAA2B,CAAC"}

package/dist/features/device-state/routes/state-get-v3.d.ts

@@ -189,6 +189,11 @@ declare const getDevice: (req: import("@balena/pinejs/out/sbvr-api/permissions.j
     installs__image?: Array<import("../../../balena-model.js").ImageInstall["Read"]>;
     installs__application__has__service_name?: Array<import("../../../balena-model.js").ServiceInstall["Read"]>;
     installs__service?: Array<import("../../../balena-model.js").ServiceInstall["Read"]>;
+    is_of__device__installs__application__has__service_name__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+    is_of__device__installs__service__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+    is_of__device__installs__service_environment_variable?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+    is_of__service_install__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+    is_of__device_service_environment_variable?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
 }, "id" | "status" | "created_at" | "modified_at" | "api_heartbeat_state" | "changed_api_heartbeat_state_on__date" | "uuid" | "local_id" | "device_name" | "note" | "is_online" | "last_connectivity_event" | "is_connected_to_vpn" | "last_vpn_event" | "is_locked_until__date" | "public_address" | "ip_address" | "mac_address" | "memory_usage" | "memory_total" | "storage_block_device" | "storage_usage" | "storage_total" | "cpu_usage" | "cpu_temp" | "is_undervolted" | "cpu_id" | "download_progress" | "os_version" | "os_variant" | "supervisor_version" | "provisioning_progress" | "provisioning_state" | "api_port" | "api_secret" | "update_status" | "last_update_status_event" | "is_web_accessible" | "is_frozen" | "overall_status" | "overall_progress"> & {
     readonly device_config_variable: import("@balena/abstract-sql-to-typescript").PickDeferred<{
         created_at: import("@balena/sbvr-types").Types["Date Time"]["Read"];
@@ -332,6 +337,11 @@ declare const getDevice: (req: import("@balena/pinejs/out/sbvr-api/permissions.j
                     service_install?: Array<import("../../../balena-model.js").ServiceInstall["Read"]>;
                     is_installed_on__device?: Array<import("../../../balena-model.js").ServiceInstall["Read"]>;
                     is_built_by__image?: Array<import("../../../balena-model.js").Image["Read"]>;
+                    is_of__device__installs__application__has__service_name__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__device__installs__service__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__device__installs__service_environment_variable?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__service_install__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__device_service_environment_variable?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
                 }, "id" | "service_name"> & {
                     readonly service_environment_variable: import("@balena/abstract-sql-to-typescript").PickDeferred<{
                         created_at: import("@balena/sbvr-types").Types["Date Time"]["Read"];
@@ -426,12 +436,21 @@ declare const getDevice: (req: import("@balena/pinejs/out/sbvr-api/permissions.j
             name: import("@balena/sbvr-types").Types["Short Text"]["Read"];
             id: import("@balena/sbvr-types").Types["Serial"]["Read"];
             value: import("@balena/sbvr-types").Types["Text"]["Read"];
+            service: {
+                __id: import("../../../balena-model.js").Service["Read"]["id"];
+            } | [import("../../../balena-model.js").Service["Read"]] | [] | null;
+            device: {
+                __id: import("../../../balena-model.js").Device["Read"]["id"];
+            } | [import("../../../balena-model.js").Device["Read"]] | [] | null;
             device__installs__application__has__service_name: {
                 __id: import("../../../balena-model.js").ServiceInstall["Read"]["id"];
             } | [import("../../../balena-model.js").ServiceInstall["Read"]];
             device__installs__service: {
                 __id: import("../../../balena-model.js").ServiceInstall["Read"]["id"];
             } | [import("../../../balena-model.js").ServiceInstall["Read"]];
+            application__has__service_name: {
+                __id: import("../../../balena-model.js").Service["Read"]["id"];
+            } | [import("../../../balena-model.js").Service["Read"]] | [] | null;
         }, "name" | "value">[];
     })[];
     readonly belongs_to__application: (import("@balena/abstract-sql-to-typescript").PickDeferred<{
@@ -666,6 +685,11 @@ declare const getDevice: (req: import("@balena/pinejs/out/sbvr-api/permissions.j
                     service_install?: Array<import("../../../balena-model.js").ServiceInstall["Read"]>;
                     is_installed_on__device?: Array<import("../../../balena-model.js").ServiceInstall["Read"]>;
                     is_built_by__image?: Array<import("../../../balena-model.js").Image["Read"]>;
+                    is_of__device__installs__application__has__service_name__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__device__installs__service__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__device__installs__service_environment_variable?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__service_install__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__device_service_environment_variable?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
                 }, "id" | "service_name"> & {
                     readonly service_environment_variable: import("@balena/abstract-sql-to-typescript").PickDeferred<{
                         created_at: import("@balena/sbvr-types").Types["Date Time"]["Read"];
@@ -895,6 +919,11 @@ declare const getDevice: (req: import("@balena/pinejs/out/sbvr-api/permissions.j
                     service_install?: Array<import("../../../balena-model.js").ServiceInstall["Read"]>;
                     is_installed_on__device?: Array<import("../../../balena-model.js").ServiceInstall["Read"]>;
                     is_built_by__image?: Array<import("../../../balena-model.js").Image["Read"]>;
+                    is_of__device__installs__application__has__service_name__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__device__installs__service__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__device__installs__service_environment_variable?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__service_install__has__name?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
+                    is_of__device_service_environment_variable?: Array<import("../../../balena-model.js").DeviceServiceEnvironmentVariable["Read"]>;
                 }, "id" | "service_name"> & {
                     readonly service_environment_variable: import("@balena/abstract-sql-to-typescript").PickDeferred<{
                         created_at: import("@balena/sbvr-types").Types["Date Time"]["Read"];

package/dist/migrations/00095-add-device-service-fks-to-device-service-environment-variable.sql

@@ -0,0 +1,41 @@
+ALTER TABLE "device service environment variable"
+ADD COLUMN IF NOT EXISTS "device" INTEGER NULL;
+
+ALTER TABLE "device service environment variable"
+ADD COLUMN IF NOT EXISTS "service" INTEGER NULL;
+
+CREATE UNIQUE INDEX IF NOT EXISTS "device service environment variable_device_service_name_key"
+ON "device service environment variable" ("device", "service", "name");
+
+DO $$
+BEGIN
+	IF NOT EXISTS (
+		SELECT 1
+		FROM information_schema.table_constraints AS tc
+		JOIN information_schema.key_column_usage AS kcu ON tc.constraint_name = kcu.constraint_name
+		WHERE tc.constraint_type = 'FOREIGN KEY'
+			AND tc.table_schema = CURRENT_SCHEMA()
+			AND tc.table_name = 'device service environment variable'
+			AND kcu.column_name = 'device'
+	) THEN
+		ALTER TABLE "device service environment variable"
+		ADD CONSTRAINT "device service environment variable_device_fkey" 
+		FOREIGN KEY ("device") REFERENCES "device" ("id");
+	END IF;
+
+	IF NOT EXISTS (
+		SELECT 1
+		FROM information_schema.table_constraints AS tc
+		JOIN information_schema.key_column_usage AS kcu ON tc.constraint_name = kcu.constraint_name
+		WHERE tc.constraint_type = 'FOREIGN KEY'
+			AND tc.table_schema = CURRENT_SCHEMA()
+			AND tc.table_name = 'device service environment variable'
+			AND kcu.column_name = 'service'
+	) THEN
+		ALTER TABLE "device service environment variable"
+		ADD CONSTRAINT "device service environment variable_service_fkey" 
+		FOREIGN KEY ("service") REFERENCES "service" ("id");
+	END IF;
+END;
+$$;
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@balena/open-balena-api",
   "description": "Internet of things, Made Simple",
-  "version": "31.1.1",
+  "version": "31.2.0-build-add-device-service-fks-9099156216b4ffb1e85f2dcd4475a760cb8da5c7-1",
   "license": "AGPL-3.0",
   "repository": {
     "type": "git",
@@ -166,6 +166,6 @@
     "loader": "ts-node/esm/transpile-only"
   },
   "versionist": {
-    "publishedAt": "2024-11-11T01:27:13.163Z"
+    "publishedAt": "2024-11-13T11:35:20.955Z"
   }
 }