From 211b2d20c080ec806d196f3ec6b0d0472b00fa1b Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Mon, 23 Dec 2024 05:27:40 +0000 Subject: [PATCH] Schema updates This PS fixes the schema validation by adding specific schema draft to choose in order to prevent the processor to fall back to use the latest draft that may potentially cause issues. Also switch base ubuntu image repo to quay.io/airshipit Change-Id: Id00db3846d086c84bd179dac90ac7b9b15e4b35a --- deckhand/engine/schemas/base_schema.yaml | 2 +- .../schemas/certificate_authority_key_schema.yaml | 2 +- .../schemas/certificate_authority_schema.yaml | 2 +- .../engine/schemas/certificate_key_schema.yaml | 2 +- deckhand/engine/schemas/certificate_schema.yaml | 2 +- .../engine/schemas/layering_policy_schema.yaml | 2 +- deckhand/engine/schemas/metadata_control.yaml | 2 +- deckhand/engine/schemas/metadata_document.yaml | 2 +- deckhand/engine/schemas/passphrase_schema.yaml | 2 +- deckhand/engine/schemas/private_key_schema.yaml | 2 +- deckhand/engine/schemas/public_key_schema.yaml | 2 +- .../engine/schemas/validation_policy_schema.yaml | 2 +- .../gabbits/resources/deckhand-owned-sample.yaml | 14 +++++++------- .../design-doc-substitution-generic-sample.yaml | 2 +- .../gabbits/resources/sample-schema-v2.yaml | 2 +- .../gabbits/resources/sample-schema.yaml | 2 +- .../gabbits/resources/ucp-sample-documents.yaml | 2 +- .../gabbits/resources/unusual-documents.yaml | 8 ++++---- images/deckhand/Dockerfile.ubuntu_jammy | 2 +- 19 files changed, 28 insertions(+), 28 deletions(-) diff --git a/deckhand/engine/schemas/base_schema.yaml b/deckhand/engine/schemas/base_schema.yaml index d6cfe71b..9dfd0052 100644 --- a/deckhand/engine/schemas/base_schema.yaml +++ b/deckhand/engine/schemas/base_schema.yaml @@ -18,7 +18,7 @@ metadata: name: deckhand/Base/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# properties: schema: type: string diff --git a/deckhand/engine/schemas/certificate_authority_key_schema.yaml b/deckhand/engine/schemas/certificate_authority_key_schema.yaml index 3f4812e6..d95add16 100644 --- a/deckhand/engine/schemas/certificate_authority_key_schema.yaml +++ b/deckhand/engine/schemas/certificate_authority_key_schema.yaml @@ -18,5 +18,5 @@ metadata: name: deckhand/CertificateAuthorityKey/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string diff --git a/deckhand/engine/schemas/certificate_authority_schema.yaml b/deckhand/engine/schemas/certificate_authority_schema.yaml index 828ce17a..dbe3d63d 100644 --- a/deckhand/engine/schemas/certificate_authority_schema.yaml +++ b/deckhand/engine/schemas/certificate_authority_schema.yaml @@ -18,5 +18,5 @@ metadata: name: deckhand/CertificateAuthority/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string diff --git a/deckhand/engine/schemas/certificate_key_schema.yaml b/deckhand/engine/schemas/certificate_key_schema.yaml index a2d08f5b..d82ab520 100644 --- a/deckhand/engine/schemas/certificate_key_schema.yaml +++ b/deckhand/engine/schemas/certificate_key_schema.yaml @@ -18,5 +18,5 @@ metadata: name: deckhand/CertificateKey/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string diff --git a/deckhand/engine/schemas/certificate_schema.yaml b/deckhand/engine/schemas/certificate_schema.yaml index d89897a4..579e1074 100644 --- a/deckhand/engine/schemas/certificate_schema.yaml +++ b/deckhand/engine/schemas/certificate_schema.yaml @@ -18,5 +18,5 @@ metadata: name: deckhand/Certificate/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string diff --git a/deckhand/engine/schemas/layering_policy_schema.yaml b/deckhand/engine/schemas/layering_policy_schema.yaml index 60314c59..bd790b2d 100644 --- a/deckhand/engine/schemas/layering_policy_schema.yaml +++ b/deckhand/engine/schemas/layering_policy_schema.yaml @@ -18,7 +18,7 @@ metadata: name: deckhand/LayeringPolicy/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: object properties: layerOrder: diff --git a/deckhand/engine/schemas/metadata_control.yaml b/deckhand/engine/schemas/metadata_control.yaml index 3a865157..c3e0a347 100644 --- a/deckhand/engine/schemas/metadata_control.yaml +++ b/deckhand/engine/schemas/metadata_control.yaml @@ -4,7 +4,7 @@ metadata: name: metadata/Control/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: object properties: schema: diff --git a/deckhand/engine/schemas/metadata_document.yaml b/deckhand/engine/schemas/metadata_document.yaml index c4b8db27..58dc7abd 100644 --- a/deckhand/engine/schemas/metadata_document.yaml +++ b/deckhand/engine/schemas/metadata_document.yaml @@ -4,7 +4,7 @@ metadata: name: metadata/Document/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# definitions: parent_selector_requires_actions: dependencies: diff --git a/deckhand/engine/schemas/passphrase_schema.yaml b/deckhand/engine/schemas/passphrase_schema.yaml index f1f12265..2f6a414d 100644 --- a/deckhand/engine/schemas/passphrase_schema.yaml +++ b/deckhand/engine/schemas/passphrase_schema.yaml @@ -18,5 +18,5 @@ metadata: name: deckhand/Passphrase/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string diff --git a/deckhand/engine/schemas/private_key_schema.yaml b/deckhand/engine/schemas/private_key_schema.yaml index 68582251..bb7ef4a6 100644 --- a/deckhand/engine/schemas/private_key_schema.yaml +++ b/deckhand/engine/schemas/private_key_schema.yaml @@ -18,5 +18,5 @@ metadata: name: deckhand/PrivateKey/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string diff --git a/deckhand/engine/schemas/public_key_schema.yaml b/deckhand/engine/schemas/public_key_schema.yaml index 7696cfa2..8bdca2f1 100644 --- a/deckhand/engine/schemas/public_key_schema.yaml +++ b/deckhand/engine/schemas/public_key_schema.yaml @@ -18,5 +18,5 @@ metadata: name: deckhand/PublicKey/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string diff --git a/deckhand/engine/schemas/validation_policy_schema.yaml b/deckhand/engine/schemas/validation_policy_schema.yaml index 94a2a657..3a8002df 100644 --- a/deckhand/engine/schemas/validation_policy_schema.yaml +++ b/deckhand/engine/schemas/validation_policy_schema.yaml @@ -18,7 +18,7 @@ metadata: name: deckhand/ValidationPolicy/v1 schema: metadata/Control/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: object properties: validations: diff --git a/deckhand/tests/functional/gabbits/resources/deckhand-owned-sample.yaml b/deckhand/tests/functional/gabbits/resources/deckhand-owned-sample.yaml index eb06741f..4278263c 100644 --- a/deckhand/tests/functional/gabbits/resources/deckhand-owned-sample.yaml +++ b/deckhand/tests/functional/gabbits/resources/deckhand-owned-sample.yaml @@ -218,7 +218,7 @@ metadata: schema: metadata/Control/v1 name: deckhand/CertificateAuthority/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -226,7 +226,7 @@ metadata: schema: metadata/Control/v1 name: deckhand/CertificateAuthorityKey/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -234,7 +234,7 @@ metadata: schema: metadata/Control/v1 name: deckhand/Certificate/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -242,7 +242,7 @@ metadata: schema: metadata/Control/v1 name: deckhand/CertificateKey/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -250,7 +250,7 @@ metadata: schema: metadata/Control/v1 name: deckhand/PublicKey/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -258,7 +258,7 @@ metadata: schema: metadata/Control/v1 name: deckhand/PrivateKey/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: deckhand/DataSchema/v1 @@ -266,5 +266,5 @@ metadata: schema: metadata/Control/v1 name: deckhand/Passphrase/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string diff --git a/deckhand/tests/functional/gabbits/resources/design-doc-substitution-generic-sample.yaml b/deckhand/tests/functional/gabbits/resources/design-doc-substitution-generic-sample.yaml index 7e9404ec..7207dc07 100644 --- a/deckhand/tests/functional/gabbits/resources/design-doc-substitution-generic-sample.yaml +++ b/deckhand/tests/functional/gabbits/resources/design-doc-substitution-generic-sample.yaml @@ -13,7 +13,7 @@ metadata: schema: metadata/Control/v1 name: unusual/DictWithSecret/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: object properties: secret: diff --git a/deckhand/tests/functional/gabbits/resources/sample-schema-v2.yaml b/deckhand/tests/functional/gabbits/resources/sample-schema-v2.yaml index 4a092035..4ac6f0b5 100644 --- a/deckhand/tests/functional/gabbits/resources/sample-schema-v2.yaml +++ b/deckhand/tests/functional/gabbits/resources/sample-schema-v2.yaml @@ -4,7 +4,7 @@ metadata: schema: metadata/Control/v1 name: example/Doc/v2 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: object properties: a: diff --git a/deckhand/tests/functional/gabbits/resources/sample-schema.yaml b/deckhand/tests/functional/gabbits/resources/sample-schema.yaml index 448b5401..45a2ace6 100644 --- a/deckhand/tests/functional/gabbits/resources/sample-schema.yaml +++ b/deckhand/tests/functional/gabbits/resources/sample-schema.yaml @@ -4,7 +4,7 @@ metadata: schema: metadata/Control/v1 name: example/Doc/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: object properties: a: diff --git a/deckhand/tests/functional/gabbits/resources/ucp-sample-documents.yaml b/deckhand/tests/functional/gabbits/resources/ucp-sample-documents.yaml index 95d1fad3..52e36c89 100644 --- a/deckhand/tests/functional/gabbits/resources/ucp-sample-documents.yaml +++ b/deckhand/tests/functional/gabbits/resources/ucp-sample-documents.yaml @@ -6,7 +6,7 @@ metadata: labels: application: promenade data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# definitions: cidr: type: string diff --git a/deckhand/tests/functional/gabbits/resources/unusual-documents.yaml b/deckhand/tests/functional/gabbits/resources/unusual-documents.yaml index 5cdf6f9d..37993e29 100644 --- a/deckhand/tests/functional/gabbits/resources/unusual-documents.yaml +++ b/deckhand/tests/functional/gabbits/resources/unusual-documents.yaml @@ -4,7 +4,7 @@ metadata: schema: metadata/Control/v1 name: unusual/List/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: array items: type: string @@ -27,7 +27,7 @@ metadata: schema: metadata/Control/v1 name: unusual/DictWithSecret/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: object properties: secret: @@ -56,7 +56,7 @@ metadata: schema: metadata/Control/v1 name: unusual/String/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: string --- schema: unusual/String/v1 @@ -74,7 +74,7 @@ metadata: schema: metadata/Control/v1 name: unusual/Integer/v1 data: - $schema: http://json-schema.org/schema# + $schema: http://json-schema.org/draft-04/schema# type: integer --- schema: unusual/Integer/v1 diff --git a/images/deckhand/Dockerfile.ubuntu_jammy b/images/deckhand/Dockerfile.ubuntu_jammy index c5204c02..fb53d9ae 100644 --- a/images/deckhand/Dockerfile.ubuntu_jammy +++ b/images/deckhand/Dockerfile.ubuntu_jammy @@ -18,7 +18,7 @@ # 429 Too Many Requests - Server message: too many requests: # You have reached your pull rate limit. # You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit -ARG FROM=public.ecr.aws/docker/library/ubuntu:jammy +ARG FROM=quay.io/airshipit/ubuntu:jammy FROM ${FROM} LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode'