From 2a60e24a365dd18e3da563dc278e187696803c29 Mon Sep 17 00:00:00 2001 From: Joanna Kossakowska Date: Wed, 1 Oct 2025 09:39:45 -0700 Subject: [PATCH 1/4] Fix installPackages regex for OS update policy in openapispecs --- charts/tenancy-api-mapping/Chart.yaml | 4 ++-- tenancy-api-mapping/VERSION | 2 +- ...-infra-core-edge-infrastructure-manager-openapi-all.yaml | 2 +- .../openapispecs/combined/combined_spec.yaml | 4 ++-- ...-infra-core-edge-infrastructure-manager-openapi-all.yaml | 2 +- tenancy-api-mapping/package-lock.json | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/tenancy-api-mapping/Chart.yaml b/charts/tenancy-api-mapping/Chart.yaml index 94684349..492d73f6 100644 --- a/charts/tenancy-api-mapping/Chart.yaml +++ b/charts/tenancy-api-mapping/Chart.yaml @@ -6,5 +6,5 @@ apiVersion: v2 name: tenancy-api-mapping description: A Helm chart for bootstrapping the 'tenancy-api-mapping' type: application -version: 25.2.3 -appVersion: "25.2.3" +version: 25.2.4 +appVersion: "25.2.4" diff --git a/tenancy-api-mapping/VERSION b/tenancy-api-mapping/VERSION index a7ee35a3..bfa363e7 100644 --- a/tenancy-api-mapping/VERSION +++ b/tenancy-api-mapping/VERSION @@ -1 +1 @@ -1.8.3 +1.8.4 diff --git a/tenancy-api-mapping/apimappingconfigcrs/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml b/tenancy-api-mapping/apimappingconfigcrs/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml index 43152965..eb639ed0 100644 --- a/tenancy-api-mapping/apimappingconfigcrs/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml +++ b/tenancy-api-mapping/apimappingconfigcrs/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml @@ -12,7 +12,7 @@ spec: specGenEnabled: true repoConf: url: "https://github.com/open-edge-platform/infra-core.git" - tag: "apiv2/v2.5.2" + tag: "apiv2/v2.5.3" specFilePath: "apiv2/api/openapi/openapi.yaml" mappings: - externalURI: /v1/projects/{projectName}/regions diff --git a/tenancy-api-mapping/openapispecs/combined/combined_spec.yaml b/tenancy-api-mapping/openapispecs/combined/combined_spec.yaml index 9aeab59c..60535660 100644 --- a/tenancy-api-mapping/openapispecs/combined/combined_spec.yaml +++ b/tenancy-api-mapping/openapispecs/combined/combined_spec.yaml @@ -7190,7 +7190,7 @@ components: Freeform text, OS-dependent. A list of package names, one per line (newline separated). Must not contain version information. Applies only to Mutable OSes. maxLength: 500000 - pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*+~()"\ \n{}[]]+$ + pattern: ^$|^[A-Za-z0-9._/:;=@?!#,<>\-*+~()\[\]{} \n]+$ title: install_packages type: string kernelCommand: @@ -10520,7 +10520,7 @@ components: info: description: Tenancy aware APIs for the Open Edge Platform services title: Multi tenancy APIs - version: 1.8.3 + version: 1.8.4 openapi: 3.0.3 paths: /v1/orgs: diff --git a/tenancy-api-mapping/openapispecs/generated/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml b/tenancy-api-mapping/openapispecs/generated/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml index 73685eb3..e7b4f179 100644 --- a/tenancy-api-mapping/openapispecs/generated/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml +++ b/tenancy-api-mapping/openapispecs/generated/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml @@ -7959,7 +7959,7 @@ components: Freeform text, OS-dependent. A list of package names, one per line (newline separated). Must not contain version information. Applies only to Mutable OSes. maxLength: 500000 - pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*+~()"\ \n{}[]]+$ + pattern: ^$|^[A-Za-z0-9._/:;=@?!#,<>\-*+~()\[\]{} \n]+$ title: install_packages type: string kernelCommand: diff --git a/tenancy-api-mapping/package-lock.json b/tenancy-api-mapping/package-lock.json index 30dd4977..af5adb57 100644 --- a/tenancy-api-mapping/package-lock.json +++ b/tenancy-api-mapping/package-lock.json @@ -580,7 +580,7 @@ }, "node_modules/@redocly/cli": { "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@redocly/cli/-/cli-2.2.2.tgz", + "resolved": "https://pixi.intel.com/@redocly/cli/-/cli-2.2.2.tgz", "integrity": "sha512-LqC7VGoMxWZZC6P96vZO5JOXGSo5Aj6A2KiLcPYPLrZT4Rr/aMBjMauJ4lacX/Z2SuaWZ5CrcnprY1QlL/ZFkQ==", "dev": true, "license": "MIT", @@ -673,7 +673,7 @@ }, "node_modules/@redocly/openapi-cli": { "version": "1.0.0-beta.94", - "resolved": "https://registry.npmjs.org/@redocly/openapi-cli/-/openapi-cli-1.0.0-beta.94.tgz", + "resolved": "https://pixi.intel.com/@redocly/openapi-cli/-/openapi-cli-1.0.0-beta.94.tgz", "integrity": "sha512-VHPVIP4K+KgYLDbQXIONS6GRMLsYz7tKa3QVVk83KS7X58fFC/N48hB1Ap2vnryj8HLSrG0yP9y6ZGH1t7kv7g==", "license": "MIT", "dependencies": { @@ -2430,7 +2430,7 @@ }, "node_modules/openapi-format": { "version": "1.29.0", - "resolved": "https://registry.npmjs.org/openapi-format/-/openapi-format-1.29.0.tgz", + "resolved": "https://pixi.intel.com/openapi-format/-/openapi-format-1.29.0.tgz", "integrity": "sha512-ueukGZ1tDeUaKEvKIyVDwKJKxKJ15U1PR8nGp6WFDqBMzT2Sofb+WXWJDEceJwRCGH3QXiKraBFC5UUcrQCDKA==", "license": "MIT", "dependencies": { From 8c2fc23ca71ec9cbec5aee7a6c6d482894ab7f1d Mon Sep 17 00:00:00 2001 From: Joanna Kossakowska Date: Wed, 1 Oct 2025 10:33:24 -0700 Subject: [PATCH 2/4] Fix --- tenancy-api-mapping/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tenancy-api-mapping/package-lock.json b/tenancy-api-mapping/package-lock.json index af5adb57..30dd4977 100644 --- a/tenancy-api-mapping/package-lock.json +++ b/tenancy-api-mapping/package-lock.json @@ -580,7 +580,7 @@ }, "node_modules/@redocly/cli": { "version": "2.2.2", - "resolved": "https://pixi.intel.com/@redocly/cli/-/cli-2.2.2.tgz", + "resolved": "https://registry.npmjs.org/@redocly/cli/-/cli-2.2.2.tgz", "integrity": "sha512-LqC7VGoMxWZZC6P96vZO5JOXGSo5Aj6A2KiLcPYPLrZT4Rr/aMBjMauJ4lacX/Z2SuaWZ5CrcnprY1QlL/ZFkQ==", "dev": true, "license": "MIT", @@ -673,7 +673,7 @@ }, "node_modules/@redocly/openapi-cli": { "version": "1.0.0-beta.94", - "resolved": "https://pixi.intel.com/@redocly/openapi-cli/-/openapi-cli-1.0.0-beta.94.tgz", + "resolved": "https://registry.npmjs.org/@redocly/openapi-cli/-/openapi-cli-1.0.0-beta.94.tgz", "integrity": "sha512-VHPVIP4K+KgYLDbQXIONS6GRMLsYz7tKa3QVVk83KS7X58fFC/N48hB1Ap2vnryj8HLSrG0yP9y6ZGH1t7kv7g==", "license": "MIT", "dependencies": { @@ -2430,7 +2430,7 @@ }, "node_modules/openapi-format": { "version": "1.29.0", - "resolved": "https://pixi.intel.com/openapi-format/-/openapi-format-1.29.0.tgz", + "resolved": "https://registry.npmjs.org/openapi-format/-/openapi-format-1.29.0.tgz", "integrity": "sha512-ueukGZ1tDeUaKEvKIyVDwKJKxKJ15U1PR8nGp6WFDqBMzT2Sofb+WXWJDEceJwRCGH3QXiKraBFC5UUcrQCDKA==", "license": "MIT", "dependencies": { From 219b8002d5358bc9a870afa8564360f427b808d9 Mon Sep 17 00:00:00 2001 From: Joanna Kossakowska Date: Mon, 6 Oct 2025 05:26:19 -0700 Subject: [PATCH 3/4] Rename os update policy fields --- ...ge-infrastructure-manager-openapi-all.yaml | 2 +- .../openapispecs/combined/combined_spec.yaml | 31 ++++++++++++++++--- ...ge-infrastructure-manager-openapi-all.yaml | 31 ++++++++++++++++--- 3 files changed, 53 insertions(+), 11 deletions(-) diff --git a/tenancy-api-mapping/apimappingconfigcrs/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml b/tenancy-api-mapping/apimappingconfigcrs/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml index eb639ed0..30ad6e57 100644 --- a/tenancy-api-mapping/apimappingconfigcrs/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml +++ b/tenancy-api-mapping/apimappingconfigcrs/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml @@ -12,7 +12,7 @@ spec: specGenEnabled: true repoConf: url: "https://github.com/open-edge-platform/infra-core.git" - tag: "apiv2/v2.5.3" + tag: "apiv2/v2.5.6" specFilePath: "apiv2/api/openapi/openapi.yaml" mappings: - externalURI: /v1/projects/{projectName}/regions diff --git a/tenancy-api-mapping/openapispecs/combined/combined_spec.yaml b/tenancy-api-mapping/openapispecs/combined/combined_spec.yaml index 60535660..5e2e6476 100644 --- a/tenancy-api-mapping/openapispecs/combined/combined_spec.yaml +++ b/tenancy-api-mapping/openapispecs/combined/combined_spec.yaml @@ -709,6 +709,13 @@ components: maxItems: 100 type: array type: object + AmtSku: + enum: + - AMT_SKU_UNSPECIFIED + - AMT_SKU_AMT + - AMT_SKU_ISM + title: AmtSku + type: string AmtState: description: The state of the AMT (Active Management Technology) component. enum: @@ -4634,11 +4641,7 @@ components: description: A Host resource. properties: amtSku: - description: coming from device introspection - maxLength: 96 - readOnly: true - title: amt_sku - type: string + $ref: '#/components/schemas/AmtSku' amtStatus: description: coming from device introspection. Set only by the DM RM. maxLength: 1024 @@ -7189,6 +7192,7 @@ components: description: |- Freeform text, OS-dependent. A list of package names, one per line (newline separated). Must not contain version information. Applies only to Mutable OSes. + Deprecated, will be removed in EMF v3.2.0, use update_packages field instead. maxLength: 500000 pattern: ^$|^[A-Za-z0-9._/:;=@?!#,<>\-*+~()\[\]{} \n]+$ title: install_packages @@ -7197,6 +7201,7 @@ components: description: |- The OS resource's kernel Command Line Options. Applies only to Mutable OSes. + Deprecated, will be removed in EMF v3.2.0, use update_kernel_command field instead. maxLength: 500 pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*()" ]+$ title: kernel_command @@ -7224,6 +7229,22 @@ components: writeOnly: true timestamps: $ref: '#/components/schemas/Timestamps' + updateKernelCommand: + description: |- + The OS resource's kernel Command Line Options. + Applies only to Mutable OSes. + maxLength: 500 + pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*()" ]+$ + title: update_kernel_command + type: string + updatePackages: + description: |- + Freeform text, OS-dependent. A list of package names, one per line (newline separated). Must not contain version information. + Applies only to Mutable OSes. + maxLength: 500000 + pattern: ^$|^[A-Za-z0-9._/:;=@?!#,<>\-*+~()\[\]{} \n]+$ + title: update_packages + type: string updatePolicy: $ref: '#/components/schemas/UpdatePolicy' updateSources: diff --git a/tenancy-api-mapping/openapispecs/generated/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml b/tenancy-api-mapping/openapispecs/generated/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml index e7b4f179..d949e31a 100644 --- a/tenancy-api-mapping/openapispecs/generated/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml +++ b/tenancy-api-mapping/openapispecs/generated/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml @@ -4592,6 +4592,13 @@ paths: - TelemetryMetricsProfileService components: schemas: + AmtSku: + enum: + - AMT_SKU_UNSPECIFIED + - AMT_SKU_AMT + - AMT_SKU_ISM + title: AmtSku + type: string AmtState: description: The state of the AMT (Active Management Technology) component. enum: @@ -5797,11 +5804,7 @@ components: description: A Host resource. properties: amtSku: - description: coming from device introspection - maxLength: 96 - readOnly: true - title: amt_sku - type: string + $ref: '#/components/schemas/AmtSku' amtStatus: description: coming from device introspection. Set only by the DM RM. maxLength: 1024 @@ -7958,6 +7961,7 @@ components: description: |- Freeform text, OS-dependent. A list of package names, one per line (newline separated). Must not contain version information. Applies only to Mutable OSes. + Deprecated, will be removed in EMF v3.2.0, use update_packages field instead. maxLength: 500000 pattern: ^$|^[A-Za-z0-9._/:;=@?!#,<>\-*+~()\[\]{} \n]+$ title: install_packages @@ -7966,6 +7970,7 @@ components: description: |- The OS resource's kernel Command Line Options. Applies only to Mutable OSes. + Deprecated, will be removed in EMF v3.2.0, use update_kernel_command field instead. maxLength: 500 pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*()" ]+$ title: kernel_command @@ -7993,6 +7998,22 @@ components: writeOnly: true timestamps: $ref: '#/components/schemas/Timestamps' + updateKernelCommand: + description: |- + The OS resource's kernel Command Line Options. + Applies only to Mutable OSes. + maxLength: 500 + pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*()" ]+$ + title: update_kernel_command + type: string + updatePackages: + description: |- + Freeform text, OS-dependent. A list of package names, one per line (newline separated). Must not contain version information. + Applies only to Mutable OSes. + maxLength: 500000 + pattern: ^$|^[A-Za-z0-9._/:;=@?!#,<>\-*+~()\[\]{} \n]+$ + title: update_packages + type: string updatePolicy: $ref: '#/components/schemas/UpdatePolicy' updateSources: From 586e9dfad9e52f304ccd14f992fb7abe355fe303 Mon Sep 17 00:00:00 2001 From: Joanna Kossakowska Date: Mon, 6 Oct 2025 06:12:14 -0700 Subject: [PATCH 4/4] Fix --- tenancy-api-mapping/package-lock.json | 26 +++++++++++++------------- tenancy-api-mapping/package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tenancy-api-mapping/package-lock.json b/tenancy-api-mapping/package-lock.json index 30dd4977..28fd5d81 100644 --- a/tenancy-api-mapping/package-lock.json +++ b/tenancy-api-mapping/package-lock.json @@ -13,7 +13,7 @@ "openapi-format": "^1.29.0" }, "devDependencies": { - "@redocly/cli": "^2.2.2" + "@redocly/cli": "^2.3.0" } }, "node_modules/@babel/code-frame": { @@ -579,9 +579,9 @@ } }, "node_modules/@redocly/cli": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@redocly/cli/-/cli-2.2.2.tgz", - "integrity": "sha512-LqC7VGoMxWZZC6P96vZO5JOXGSo5Aj6A2KiLcPYPLrZT4Rr/aMBjMauJ4lacX/Z2SuaWZ5CrcnprY1QlL/ZFkQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@redocly/cli/-/cli-2.3.0.tgz", + "integrity": "sha512-pR8D1GUtoAV2mcYZ5ZrVC2vuQ+8k02qVV19uqxQoJ11vgjnIukkoRZ3/LI2HH75B1wxaGn/MeWngn+5pRODHSQ==", "dev": true, "license": "MIT", "dependencies": { @@ -589,8 +589,8 @@ "@opentelemetry/resources": "2.0.1", "@opentelemetry/sdk-trace-node": "2.0.1", "@opentelemetry/semantic-conventions": "1.34.0", - "@redocly/openapi-core": "2.2.2", - "@redocly/respect-core": "2.2.2", + "@redocly/openapi-core": "2.3.0", + "@redocly/respect-core": "2.3.0", "abort-controller": "^3.0.0", "chokidar": "^3.5.1", "colorette": "^1.2.0", @@ -724,9 +724,9 @@ "license": "MIT" }, "node_modules/@redocly/openapi-core": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-2.2.2.tgz", - "integrity": "sha512-7Db3yYOAH0k0dq+EkWEh0Cff+KzlzR82YG+R0UphG3sxgtVT7EE4OoDKGcVYey0Dh+Qn728WCKNXdBBKb3Svhw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-2.3.0.tgz", + "integrity": "sha512-A/zA8lMhgM1Uyct+RP4YVNgedYko4XPOANDgS0wK0mmR3+R/Et13QPkzsh8jc+xe0QKwbGIETwEnLTLrPRuvrw==", "dev": true, "license": "MIT", "dependencies": { @@ -762,16 +762,16 @@ } }, "node_modules/@redocly/respect-core": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@redocly/respect-core/-/respect-core-2.2.2.tgz", - "integrity": "sha512-OpiS9LFlBd8xfHAzH5WJ7zTDsjL7FO9jH5QNLCy6/macnL0b6tg/uDUmMjxyUU7/eL2eQUEr8wlIa5oZaN5ZNg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@redocly/respect-core/-/respect-core-2.3.0.tgz", + "integrity": "sha512-+8n9DYOigyUOhLbJl64pHhsqg1qlICN0ViylAczVbtGNFCV2rrEE06dhEQce/YVSIOCLxsXsPJLIBUt8A8VG6w==", "dev": true, "license": "MIT", "dependencies": { "@faker-js/faker": "^7.6.0", "@noble/hashes": "^1.8.0", "@redocly/ajv": "8.11.2", - "@redocly/openapi-core": "2.2.2", + "@redocly/openapi-core": "2.3.0", "better-ajv-errors": "^1.2.0", "colorette": "^2.0.20", "jest-matcher-utils": "^29.3.1", diff --git a/tenancy-api-mapping/package.json b/tenancy-api-mapping/package.json index 3a1cb754..478baf21 100644 --- a/tenancy-api-mapping/package.json +++ b/tenancy-api-mapping/package.json @@ -12,7 +12,7 @@ "author": "", "license": "Apache-2.0", "devDependencies": { - "@redocly/cli": "^2.2.2" + "@redocly/cli": "^2.3.0" }, "dependencies": { "@redocly/openapi-cli": "^1.0.0-beta.59",