direct: Add support for apitypes.yml to override apitypes.generated.yml (#4433)

Co-authored-by: Claude Sonnet 4.5 <[email protected]>

Author: denik

Makefile

@@ -183,7 +183,7 @@ generate-direct-clean:
 bundle/direct/dresources/apitypes.generated.yml: ./bundle/direct/tools/generate_apitypes.py .codegen/openapi.json acceptance/bundle/refschema/out.fields.txt
 	python3 $^ > $@
 
-bundle/direct/dresources/resources.generated.yml: ./bundle/direct/tools/generate_resources.py .codegen/openapi.json bundle/direct/dresources/apitypes.generated.yml acceptance/bundle/refschema/out.fields.txt
+bundle/direct/dresources/resources.generated.yml: ./bundle/direct/tools/generate_resources.py .codegen/openapi.json bundle/direct/dresources/apitypes.generated.yml bundle/direct/dresources/apitypes.yml acceptance/bundle/refschema/out.fields.txt
 	python3 $^ > $@
 
 .PHONY: lint lintfull tidy lintcheck fmt fmtfull test test-unit test-acc test-slow test-slow-unit test-slow-acc cover showcover build snapshot snapshot-release schema integration integration-short acc-cover acc-showcover docs ws wsfix links checks test-update test-update-templates generate-out-test-toml test-update-aws test-update-all generate-validation

bundle/direct/dresources/apitypes.yml

@@ -0,0 +1,5 @@
+# Override apitypes.generated.yml here.
+# This file is not auto-generated and can be manually edited.
+#
+# Set a value to null to remove a type:
+# jobs: null

bundle/direct/tools/generate_resources.py

@@ -12,10 +12,19 @@
 import yaml
 
 
-def parse_apitypes(path):
-    """Parse apitypes.generated.yml to get resource types."""
-    data = yaml.safe_load(path.read_text())
-    return {resource: type_name for resource, type_name in data.items() if type_name}
+def parse_apitypes(generated_path, override_path):
+    """Parse apitypes.generated.yml and override with apitypes.yml."""
+    result = yaml.safe_load(generated_path.read_text()) or {}
+
+    # Override with non-generated apitypes.yml (null values remove entries)
+    override_data = yaml.safe_load(override_path.read_text()) or {}
+    for resource, type_name in override_data.items():
+        if type_name:
+            result[resource] = type_name
+        else:
+            result.pop(resource, None)
+
+    return result
 
 
 def parse_out_fields(path):
@@ -139,11 +148,11 @@ def main():
     parser = argparse.ArgumentParser(description="Generate resources YAML from OpenAPI schema")
     parser.add_argument("apischema", type=Path, help="Path to OpenAPI schema JSON file")
     parser.add_argument("apitypes", type=Path, help="Path to apitypes.generated.yml file")
-    # TODO: add non-generated apitypes.yml here once the need to override generated ones arises
+    parser.add_argument("apitypes_override", type=Path, help="Path to apitypes.yml override file")
     parser.add_argument("out_fields", type=Path, help="Path to out.fields.txt file")
     args = parser.parse_args()
 
-    resource_types = parse_apitypes(args.apitypes)
+    resource_types = parse_apitypes(args.apitypes, args.apitypes_override)
     state_fields = parse_out_fields(args.out_fields)
     schemas = json.loads(args.apischema.read_text()).get("components", {}).get("schemas", {})
 

yamlfmt.yml

@@ -2,6 +2,7 @@ exclude:
   - libs/dyn/yamlloader/testdata
   - acceptance/selftest/bundleconfig # https://github.com/google/yamlfmt/issues/254
   - acceptance/bundle/artifacts/nil_artifacts/databricks.yml # https://github.com/google/yamlfmt/issues/253
+  - bundle/direct/dresources/apitypes.yml # remove comments
 formatter:
   type: basic
   retain_line_breaks_single: true