From 383495128479bb550d6ae51aeb83e03652f0d387 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Tue, 1 Oct 2024 10:22:31 +0200 Subject: [PATCH 1/2] Boolean defaults cannot be strings --- roles/vault_utils/values-secrets.v2.schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/vault_utils/values-secrets.v2.schema.json b/roles/vault_utils/values-secrets.v2.schema.json index c8b5c02..2d29589 100644 --- a/roles/vault_utils/values-secrets.v2.schema.json +++ b/roles/vault_utils/values-secrets.v2.schema.json @@ -276,12 +276,12 @@ "base64": { "type": "boolean", "description": "Before uploading the secret the content is base-64 encoded. It is recommended to set this to true when dealing with files", - "default": "false" + "default": false }, "override": { "type": "boolean", "description": "When onMissingValue is set to 'generate' and the secret already exists in the vault update it", - "default": "false" + "default": false } }, "dependentRequired": { From 274745a1662b4d746b1fe50fc3bb34034ab0eb67 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Tue, 1 Oct 2024 10:23:23 +0200 Subject: [PATCH 2/2] Use --fill-defaults when running json schema check Reason for this is https://python-jsonschema.readthedocs.io/en/stable/faq/#why-doesn-t-my-schema-s-default-property-set-the-default-on-my-instance --- .github/workflows/jsonschema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jsonschema.yaml b/.github/workflows/jsonschema.yaml index 0b0db8a..ea127e2 100644 --- a/.github/workflows/jsonschema.yaml +++ b/.github/workflows/jsonschema.yaml @@ -28,4 +28,4 @@ jobs: - name: Verify secrets json schema run: | set -e - for i in values-secret-v2-base values-secret-v2-generic-onlygenerate values-secret-v2-block-yamlstring; do echo "$i"; check-jsonschema --schemafile ./roles/vault_utils/values-secrets.v2.schema.json "tests/unit/v2/$i.yaml"; done + for i in values-secret-v2-base values-secret-v2-generic-onlygenerate values-secret-v2-block-yamlstring; do echo "$i"; check-jsonschema --fill-defaults --schemafile ./roles/vault_utils/values-secrets.v2.schema.json "tests/unit/v2/$i.yaml"; done