Skip to content

Add match schema update prek hook for Helm values_schema.schema.json file #71680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Miretpl wants to merge 2 commits into
base: main
Choose a base branch
from
+186 −6
Open

Add match schema update prek hook for Helm values_schema.schema.json file #71680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4e3ee3
Add script for values_schema.schema.json match filed update
Miretpl Aug 16, 2026
083991f
Update values_schema.schema.json file
Miretpl Aug 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions chart/.pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@ repos:
pass_filenames: false
files: ^values\.schema\.json$
require_serial: true
- id: update-helm-values-schema-schema-file-type-field-match
name: Update Helm Values Schema Schema File (type field match)
entry: ../scripts/ci/prek/update_helm_schema_schema_type_fields_match.py
language: python
pass_filenames: false
files: ^values\.schema\.json$|^values\.schema\.schema\.json$
require_serial: true
- id: lint-json-schema
name: Lint chart/values.schema.json
entry: ../scripts/ci/prek/lint_json_schema.py
Expand Down
88 changes: 82 additions & 6 deletions chart/values_schema.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,56 @@
},
"if": {
"oneOf": [
{
"properties": {
"type": {
"const": "array"
},
"items": false
}
},
{
"properties": {
"type": {
"const": [
"array",
"null"
]
},
"items": false
}
},
{
"properties": {
"type": {
"const": "boolean"
}
}
},
{
"properties": {
"type": {
"const": [
"boolean",
"integer",
"number",
"string"
]
}
}
},
{
"properties": {
"type": {
"const": [
"boolean",
"null",
"number",
"string"
]
}
}
},
{
"properties": {
"type": {
Expand All @@ -32,21 +82,48 @@
{
"properties": {
"type": {
"const": "number"
"const": [
"integer",
"null"
]
}
}
},
{
"properties": {
"type": {
"const": "string"
"const": [
"integer",
"string"
]
}
}
},
{
"properties": {
"type": {
"const": "boolean"
"const": [
"null",
"object"
]
},
"properties": false
}
},
{
"properties": {
"type": {
"const": [
"null",
"string"
]
}
}
},
{
"properties": {
"type": {
"const": "number"
}
}
},
Expand All @@ -61,9 +138,8 @@
{
"properties": {
"type": {
"const": "array"
},
"items": false
"const": "string"
}
}
}
]
Expand Down
97 changes: 97 additions & 0 deletions scripts/ci/prek/update_helm_schema_schema_type_fields_match.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
#!/usr/bin/env python
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

from __future__ import annotations

import json
import sys

from common_prek_utils import AIRFLOW_ROOT_PATH

_VALUES_SCHEMA_FILE = AIRFLOW_ROOT_PATH / "chart/values.schema.json"
_VALUES_SCHEMA_SCHEMA_FILE = AIRFLOW_ROOT_PATH / "chart/values_schema.schema.json"


if __name__ != "__main__":
raise SystemExit(
"This file is intended to be executed as an executable program. You cannot use it as a module."
)


def _list_all_field_types(data: dict | list) -> list:
type_fields = []

if isinstance(data, dict):
if "type" in data:
if isinstance(data["type"], list):
type_fields.append(tuple(data["type"]))
elif not isinstance(data["type"], dict):
type_fields.append(data["type"])

# Skip potential `type` fields inside `default` fields as defaults are not
# part of the schema file verification process
temp = list((v for k, v in data.items() if k != "default"))
elif isinstance(data, list):
temp = data

for val in (val for val in temp if isinstance(val, (dict, list))):
type_fields.extend(_list_all_field_types(val))

return type_fields


def _sort(data: str | tuple[str, ...]) -> str:
if isinstance(data, tuple):
return "".join(data)

return data


def _get_one_of_for_schema(fields: list) -> list:
one_of: list = []

for field_type in fields:
one_of.append({"properties": {"type": {"const": field_type}}})

if "array" in field_type:
one_of[-1]["properties"]["items"] = False
elif "object" in field_type:
one_of[-1]["properties"]["properties"] = False

return one_of


def main() -> int:
with open(_VALUES_SCHEMA_FILE, encoding="utf-8") as schema_file:
schema = json.loads(schema_file.read())

field_types = sorted(set(_list_all_field_types(schema)), key=_sort)

with open(_VALUES_SCHEMA_SCHEMA_FILE, encoding="utf-8") as schema_file:
schema = json.loads(schema_file.read())

schema["definitions"]["leafs"]["if"]["oneOf"] = _get_one_of_for_schema(field_types)

with open(_VALUES_SCHEMA_SCHEMA_FILE, "w", encoding="utf-8") as schema_file:
json.dump(schema, schema_file, indent=4)
schema_file.write("\n")

return 0


sys.exit(main())