Skip to content

Commit fd5af59

Browse files
jkossakjkossak
authored
Fix installPackages regex for OS update policy and use its new fields (#265)
1 parent 552f078 commit fd5af59

File tree

7 files changed

+73
-31
lines changed

7 files changed

+73
-31
lines changed

‎charts/tenancy-api-mapping/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ apiVersion: v2
66
name: tenancy-api-mapping
77
description: A Helm chart for bootstrapping the 'tenancy-api-mapping'
88
type: application
9-
version: 25.2.3
10-
appVersion: "25.2.3"
9+
version: 25.2.4
10+
appVersion: "25.2.4"

‎tenancy-api-mapping/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.8.3
1+
1.8.4

‎tenancy-api-mapping/apimappingconfigcrs/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spec:
1212
specGenEnabled: true
1313
repoConf:
1414
url: "https://github.com/open-edge-platform/infra-core.git"
15-
tag: "apiv2/v2.5.2"
15+
tag: "apiv2/v2.5.6"
1616
specFilePath: "apiv2/api/openapi/openapi.yaml"
1717
mappings:
1818
- externalURI: /v1/projects/{projectName}/regions

‎tenancy-api-mapping/openapispecs/combined/combined_spec.yaml‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,13 @@ components:
709709
maxItems: 100
710710
type: array
711711
type: object
712+
AmtSku:
713+
enum:
714+
- AMT_SKU_UNSPECIFIED
715+
- AMT_SKU_AMT
716+
- AMT_SKU_ISM
717+
title: AmtSku
718+
type: string
712719
AmtState:
713720
description: The state of the AMT (Active Management Technology) component.
714721
enum:
@@ -4634,11 +4641,7 @@ components:
46344641
description: A Host resource.
46354642
properties:
46364643
amtSku:
4637-
description: coming from device introspection
4638-
maxLength: 96
4639-
readOnly: true
4640-
title: amt_sku
4641-
type: string
4644+
$ref: '#/components/schemas/AmtSku'
46424645
amtStatus:
46434646
description: coming from device introspection. Set only by the DM RM.
46444647
maxLength: 1024
@@ -7189,14 +7192,16 @@ components:
71897192
description: |-
71907193
Freeform text, OS-dependent. A list of package names, one per line (newline separated). Must not contain version information.
71917194
Applies only to Mutable OSes.
7195+
Deprecated, will be removed in EMF v3.2.0, use update_packages field instead.
71927196
maxLength: 500000
7193-
pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*+~()"\ \n{}[]]+$
7197+
pattern: ^$|^[A-Za-z0-9._/:;=@?!#,<>\-*+~()\[\]{} \n]+$
71947198
title: install_packages
71957199
type: string
71967200
kernelCommand:
71977201
description: |-
71987202
The OS resource's kernel Command Line Options.
71997203
Applies only to Mutable OSes.
7204+
Deprecated, will be removed in EMF v3.2.0, use update_kernel_command field instead.
72007205
maxLength: 500
72017206
pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*()" ]+$
72027207
title: kernel_command
@@ -7224,6 +7229,22 @@ components:
72247229
writeOnly: true
72257230
timestamps:
72267231
$ref: '#/components/schemas/Timestamps'
7232+
updateKernelCommand:
7233+
description: |-
7234+
The OS resource's kernel Command Line Options.
7235+
Applies only to Mutable OSes.
7236+
maxLength: 500
7237+
pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*()" ]+$
7238+
title: update_kernel_command
7239+
type: string
7240+
updatePackages:
7241+
description: |-
7242+
Freeform text, OS-dependent. A list of package names, one per line (newline separated). Must not contain version information.
7243+
Applies only to Mutable OSes.
7244+
maxLength: 500000
7245+
pattern: ^$|^[A-Za-z0-9._/:;=@?!#,<>\-*+~()\[\]{} \n]+$
7246+
title: update_packages
7247+
type: string
72277248
updatePolicy:
72287249
$ref: '#/components/schemas/UpdatePolicy'
72297250
updateSources:
@@ -10520,7 +10541,7 @@ components:
1052010541
info:
1052110542
description: Tenancy aware APIs for the Open Edge Platform services
1052210543
title: Multi tenancy APIs
10523-
version: 1.8.3
10544+
version: 1.8.4
1052410545
openapi: 3.0.3
1052510546
paths:
1052610547
/v1/orgs:

‎tenancy-api-mapping/openapispecs/generated/amc-infra-core-edge-infrastructure-manager-openapi-all.yaml‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4592,6 +4592,13 @@ paths:
45924592
- TelemetryMetricsProfileService
45934593
components:
45944594
schemas:
4595+
AmtSku:
4596+
enum:
4597+
- AMT_SKU_UNSPECIFIED
4598+
- AMT_SKU_AMT
4599+
- AMT_SKU_ISM
4600+
title: AmtSku
4601+
type: string
45954602
AmtState:
45964603
description: The state of the AMT (Active Management Technology) component.
45974604
enum:
@@ -5797,11 +5804,7 @@ components:
57975804
description: A Host resource.
57985805
properties:
57995806
amtSku:
5800-
description: coming from device introspection
5801-
maxLength: 96
5802-
readOnly: true
5803-
title: amt_sku
5804-
type: string
5807+
$ref: '#/components/schemas/AmtSku'
58055808
amtStatus:
58065809
description: coming from device introspection. Set only by the DM RM.
58075810
maxLength: 1024
@@ -7958,14 +7961,16 @@ components:
79587961
description: |-
79597962
Freeform text, OS-dependent. A list of package names, one per line (newline separated). Must not contain version information.
79607963
Applies only to Mutable OSes.
7964+
Deprecated, will be removed in EMF v3.2.0, use update_packages field instead.
79617965
maxLength: 500000
7962-
pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*+~()"\ \n{}[]]+$
7966+
pattern: ^$|^[A-Za-z0-9._/:;=@?!#,<>\-*+~()\[\]{} \n]+$
79637967
title: install_packages
79647968
type: string
79657969
kernelCommand:
79667970
description: |-
79677971
The OS resource's kernel Command Line Options.
79687972
Applies only to Mutable OSes.
7973+
Deprecated, will be removed in EMF v3.2.0, use update_kernel_command field instead.
79697974
maxLength: 500
79707975
pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*()" ]+$
79717976
title: kernel_command
@@ -7993,6 +7998,22 @@ components:
79937998
writeOnly: true
79947999
timestamps:
79958000
$ref: '#/components/schemas/Timestamps'
8001+
updateKernelCommand:
8002+
description: |-
8003+
The OS resource's kernel Command Line Options.
8004+
Applies only to Mutable OSes.
8005+
maxLength: 500
8006+
pattern: ^$|^[a-zA-Z-_0-9./:;=@?!#,<>*()" ]+$
8007+
title: update_kernel_command
8008+
type: string
8009+
updatePackages:
8010+
description: |-
8011+
Freeform text, OS-dependent. A list of package names, one per line (newline separated). Must not contain version information.
8012+
Applies only to Mutable OSes.
8013+
maxLength: 500000
8014+
pattern: ^$|^[A-Za-z0-9._/:;=@?!#,<>\-*+~()\[\]{} \n]+$
8015+
title: update_packages
8016+
type: string
79968017
updatePolicy:
79978018
$ref: '#/components/schemas/UpdatePolicy'
79988019
updateSources:

‎tenancy-api-mapping/package-lock.json‎

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tenancy-api-mapping/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "",
1313
"license": "Apache-2.0",
1414
"devDependencies": {
15-
"@redocly/cli": "^2.2.2"
15+
"@redocly/cli": "^2.3.0"
1616
},
1717
"dependencies": {
1818
"@redocly/openapi-cli": "^1.0.0-beta.59",

0 commit comments

Comments
 (0)