From 14f35f77be1f4b7d34648933342bcbfed11616f1 Mon Sep 17 00:00:00 2001 From: Kevin DeJong Date: Tue, 23 Apr 2024 08:27:49 -0700 Subject: [PATCH] Sort more enum values to create more consistency --- scripts/update_schemas_from_aws_api.py | 12 ++++++++---- scripts/update_schemas_from_boto.py | 2 +- scripts/update_specs_from_pricing.py | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/update_schemas_from_aws_api.py b/scripts/update_schemas_from_aws_api.py index d613abe8cd..76e441c5ab 100755 --- a/scripts/update_schemas_from_aws_api.py +++ b/scripts/update_schemas_from_aws_api.py @@ -63,7 +63,7 @@ def write_db_cluster(results): "then": { "properties": { "Engine": { - "enum": engines, + "enum": sorted(engines), } } }, @@ -85,7 +85,9 @@ def write_db_cluster(results): "required": ["Engine", "EngineVersion"], }, "then": { - "properties": {"EngineVersion": {"enum": results.get(engine)}} + "properties": { + "EngineVersion": {"enum": sorted(results.get(engine))} + } }, } ) @@ -132,7 +134,7 @@ def write_db_instance(results): "then": { "properties": { "Engine": { - "enum": engines, + "enum": sorted(engines), } } }, @@ -156,7 +158,9 @@ def write_db_instance(results): "required": ["Engine", "EngineVersion"], }, "then": { - "properties": {"EngineVersion": {"enum": results.get(engine)}} + "properties": { + "EngineVersion": {"enum": sorted(results.get(engine))} + } }, } ) diff --git a/scripts/update_schemas_from_boto.py b/scripts/update_schemas_from_boto.py index d250af9875..4a771e294b 100755 --- a/scripts/update_schemas_from_boto.py +++ b/scripts/update_schemas_from_boto.py @@ -1056,7 +1056,7 @@ def build_resource_type_patches(dir: str, resource_patches: ResourcePatch): { "op": "add", "path": f"{patch.path}/enum", - "value": enums, + "value": sorted(enums), } ) diff --git a/scripts/update_specs_from_pricing.py b/scripts/update_specs_from_pricing.py index bbaa73a0e1..c5d9864b9a 100755 --- a/scripts/update_specs_from_pricing.py +++ b/scripts/update_specs_from_pricing.py @@ -370,7 +370,7 @@ def write_output(resource, filename, obj): "_description": "Automatically updated using update_specs_from_pricing", } for region, values in obj.items(): - output[region] = {"enum": list(values)} + output[region] = {"enum": sorted(list(values))} with open(filename, "w+", encoding="utf-8") as f: json.dump(output, f, indent=1, sort_keys=True, separators=(",", ": "))