Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,17 @@ def test_check_standard_external_transforms_config_in_sync(self):
'r') as f:
standard_config = yaml.safe_load(f)

def _normalize(cfg):
# Sort each transform's fields deterministically
for t in cfg:
if "fields" in t and isinstance(t["fields"], list):
t["fields"] = sorted(t["fields"], key=lambda f: f.get("name", ""))
# Sort transforms deterministically
return sorted(cfg, key=lambda t: t.get("identifier", ""))

self.assertEqual(
test_config,
standard_config,
_normalize(test_config),
_normalize(standard_config),
"The standard xlang transforms config file "
"\"standard_external_transforms.yaml\" is out of sync! Please update "
"by running './gradlew generateExternalTransformsConfig' "
Expand Down
6 changes: 4 additions & 2 deletions sdks/python/gen_xlang_wrappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ class name. This can be overriden by manually providing a name.
# use dynamic provider to discover and populate wrapper details
provider = ExternalTransformProvider(BeamJarExpansionService(target))
discovered: Dict[str, ExternalTransform] = provider.get_all()
for identifier, wrapper in discovered.items():
for identifier in sorted(discovered.keys()):
wrapper = discovered[identifier]
if identifier in transforms_to_skip:
continue

Expand All @@ -153,7 +154,8 @@ class name. This can be overriden by manually providing a name.
name = modified_transform.get('name', wrapper.__name__)

fields = []
for param in wrapper.configuration_schema.values():
for param_name in sorted(wrapper.configuration_schema.keys()):
param = wrapper.configuration_schema[param_name]
(tp, nullable) = pretty_type(param.type)
field_info = {
'name': param.original_name,
Expand Down
Loading