Skip to content

chore: clean up fixup scripts #963

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

Merged
gcf-merge-on-green merged 2 commits into from
Jul 26, 2021
Merged

chore: clean up fixup scripts #963

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
b46c685
chore: clean up fixup scripts
parthea Jul 26, 2021
996b488
Merge branch 'master' into code-cleanup
parthea Jul 26, 2021
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
4 changes: 2 additions & 2 deletions gapic/ads-templates/scripts/fixup_%name_%version_keywords.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class {{ api.naming.module_name }}CallTransformer(cst.CSTTransformer):
{% endfor %}{% endfor %}
METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
{% for method in all_methods|sort(attribute='name')|unique(attribute='name') %}
'{{ method.name|snake_case }}': ({% for field in method.legacy_flattened_fields.values() %}'{{ field.name }}', {% endfor %}),
'{{ method.name|snake_case }}': ({% for field in method.legacy_flattened_fields.values() %}'{{ field.name }}', {% endfor %}),
{% endfor %}
}
{% endwith %}
Expand All @@ -54,7 +54,7 @@ class {{ api.naming.module_name }}CallTransformer(cst.CSTTransformer):
return updated

kwargs, ctrl_kwargs = partition(
lambda a: not a.keyword.value in self.CTRL_PARAMS,
lambda a: a.keyword.value not in self.CTRL_PARAMS,
kwargs
)

Expand Down
4 changes: 2 additions & 2 deletions gapic/templates/scripts/fixup_%name_%version_keywords.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class {{ api.naming.module_name }}CallTransformer(cst.CSTTransformer):
{% endfor %}{% endfor %}
METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
{% for method in all_methods|sort(attribute='name')|unique(attribute='name') %}
'{{ method.name|snake_case }}': ({% for field in method.legacy_flattened_fields.values() %}'{{ field.name }}', {% endfor %}),
'{{ method.name|snake_case }}': ({% for field in method.legacy_flattened_fields.values() %}'{{ field.name }}', {% endfor %}),
{% endfor %}
{% if opts.add_iam_methods %}
'get_iam_policy': ('resource', 'options', ),
Expand All @@ -59,7 +59,7 @@ class {{ api.naming.module_name }}CallTransformer(cst.CSTTransformer):
return updated

kwargs, ctrl_kwargs = partition(
lambda a: not a.keyword.value in self.CTRL_PARAMS,
lambda a: a.keyword.value not in self.CTRL_PARAMS,
kwargs
)

Expand Down
26 changes: 13 additions & 13 deletions tests/integration/goldens/asset/scripts/fixup_asset_v1_keywords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ def partition(
class assetCallTransformer(cst.CSTTransformer):
CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata')
METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
'analyze_iam_policy': ('analysis_query', 'execution_timeout', ),
'analyze_iam_policy_longrunning': ('analysis_query', 'output_config', ),
'batch_get_assets_history': ('parent', 'asset_names', 'content_type', 'read_time_window', ),
'create_feed': ('parent', 'feed_id', 'feed', ),
'delete_feed': ('name', ),
'export_assets': ('parent', 'output_config', 'read_time', 'asset_types', 'content_type', ),
'get_feed': ('name', ),
'list_assets': ('parent', 'read_time', 'asset_types', 'content_type', 'page_size', 'page_token', ),
'list_feeds': ('parent', ),
'search_all_iam_policies': ('scope', 'query', 'page_size', 'page_token', 'asset_types', 'order_by', ),
'search_all_resources': ('scope', 'query', 'asset_types', 'page_size', 'page_token', 'order_by', ),
'update_feed': ('feed', 'update_mask', ),
'analyze_iam_policy': ('analysis_query', 'execution_timeout', ),
'analyze_iam_policy_longrunning': ('analysis_query', 'output_config', ),
'batch_get_assets_history': ('parent', 'asset_names', 'content_type', 'read_time_window', ),
'create_feed': ('parent', 'feed_id', 'feed', ),
'delete_feed': ('name', ),
'export_assets': ('parent', 'output_config', 'read_time', 'asset_types', 'content_type', ),
'get_feed': ('name', ),
'list_assets': ('parent', 'read_time', 'asset_types', 'content_type', 'page_size', 'page_token', ),
'list_feeds': ('parent', ),
'search_all_iam_policies': ('scope', 'query', 'page_size', 'page_token', 'asset_types', 'order_by', ),
'search_all_resources': ('scope', 'query', 'asset_types', 'page_size', 'page_token', 'order_by', ),
'update_feed': ('feed', 'update_mask', ),
}

def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
Expand All @@ -69,7 +69,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
return updated

kwargs, ctrl_kwargs = partition(
lambda a: not a.keyword.value in self.CTRL_PARAMS,
lambda a: a.keyword.value not in self.CTRL_PARAMS,
kwargs
)

Expand Down
10 changes: 5 additions & 5 deletions tests/integration/goldens/credentials/scripts/fixup_credentials_v1_keywords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ def partition(
class credentialsCallTransformer(cst.CSTTransformer):
CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata')
METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
'generate_access_token': ('name', 'scope', 'delegates', 'lifetime', ),
'generate_id_token': ('name', 'audience', 'delegates', 'include_email', ),
'sign_blob': ('name', 'payload', 'delegates', ),
'sign_jwt': ('name', 'payload', 'delegates', ),
'generate_access_token': ('name', 'scope', 'delegates', 'lifetime', ),
'generate_id_token': ('name', 'audience', 'delegates', 'include_email', ),
'sign_blob': ('name', 'payload', 'delegates', ),
'sign_jwt': ('name', 'payload', 'delegates', ),
}

def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
Expand All @@ -61,7 +61,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
return updated

kwargs, ctrl_kwargs = partition(
lambda a: not a.keyword.value in self.CTRL_PARAMS,
lambda a: a.keyword.value not in self.CTRL_PARAMS,
kwargs
)

Expand Down
70 changes: 35 additions & 35 deletions tests/integration/goldens/logging/scripts/fixup_logging_v2_keywords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,40 +39,40 @@ def partition(
class loggingCallTransformer(cst.CSTTransformer):
CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata')
METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
'create_bucket': ('parent', 'bucket_id', 'bucket', ),
'create_exclusion': ('parent', 'exclusion', ),
'create_log_metric': ('parent', 'metric', ),
'create_sink': ('parent', 'sink', 'unique_writer_identity', ),
'create_view': ('parent', 'view_id', 'view', ),
'delete_bucket': ('name', ),
'delete_exclusion': ('name', ),
'delete_log': ('log_name', ),
'delete_log_metric': ('metric_name', ),
'delete_sink': ('sink_name', ),
'delete_view': ('name', ),
'get_bucket': ('name', ),
'get_cmek_settings': ('name', ),
'get_exclusion': ('name', ),
'get_log_metric': ('metric_name', ),
'get_sink': ('sink_name', ),
'get_view': ('name', ),
'list_buckets': ('parent', 'page_token', 'page_size', ),
'list_exclusions': ('parent', 'page_token', 'page_size', ),
'list_log_entries': ('resource_names', 'filter', 'order_by', 'page_size', 'page_token', ),
'list_log_metrics': ('parent', 'page_token', 'page_size', ),
'list_logs': ('parent', 'page_size', 'page_token', 'resource_names', ),
'list_monitored_resource_descriptors': ('page_size', 'page_token', ),
'list_sinks': ('parent', 'page_token', 'page_size', ),
'list_views': ('parent', 'page_token', 'page_size', ),
'tail_log_entries': ('resource_names', 'filter', 'buffer_window', ),
'undelete_bucket': ('name', ),
'update_bucket': ('name', 'bucket', 'update_mask', ),
'update_cmek_settings': ('name', 'cmek_settings', 'update_mask', ),
'update_exclusion': ('name', 'exclusion', 'update_mask', ),
'update_log_metric': ('metric_name', 'metric', ),
'update_sink': ('sink_name', 'sink', 'unique_writer_identity', 'update_mask', ),
'update_view': ('name', 'view', 'update_mask', ),
'write_log_entries': ('entries', 'log_name', 'resource', 'labels', 'partial_success', 'dry_run', ),
'create_bucket': ('parent', 'bucket_id', 'bucket', ),
'create_exclusion': ('parent', 'exclusion', ),
'create_log_metric': ('parent', 'metric', ),
'create_sink': ('parent', 'sink', 'unique_writer_identity', ),
'create_view': ('parent', 'view_id', 'view', ),
'delete_bucket': ('name', ),
'delete_exclusion': ('name', ),
'delete_log': ('log_name', ),
'delete_log_metric': ('metric_name', ),
'delete_sink': ('sink_name', ),
'delete_view': ('name', ),
'get_bucket': ('name', ),
'get_cmek_settings': ('name', ),
'get_exclusion': ('name', ),
'get_log_metric': ('metric_name', ),
'get_sink': ('sink_name', ),
'get_view': ('name', ),
'list_buckets': ('parent', 'page_token', 'page_size', ),
'list_exclusions': ('parent', 'page_token', 'page_size', ),
'list_log_entries': ('resource_names', 'filter', 'order_by', 'page_size', 'page_token', ),
'list_log_metrics': ('parent', 'page_token', 'page_size', ),
'list_logs': ('parent', 'page_size', 'page_token', 'resource_names', ),
'list_monitored_resource_descriptors': ('page_size', 'page_token', ),
'list_sinks': ('parent', 'page_token', 'page_size', ),
'list_views': ('parent', 'page_token', 'page_size', ),
'tail_log_entries': ('resource_names', 'filter', 'buffer_window', ),
'undelete_bucket': ('name', ),
'update_bucket': ('name', 'bucket', 'update_mask', ),
'update_cmek_settings': ('name', 'cmek_settings', 'update_mask', ),
'update_exclusion': ('name', 'exclusion', 'update_mask', ),
'update_log_metric': ('metric_name', 'metric', ),
'update_sink': ('sink_name', 'sink', 'unique_writer_identity', 'update_mask', ),
'update_view': ('name', 'view', 'update_mask', ),
'write_log_entries': ('entries', 'log_name', 'resource', 'labels', 'partial_success', 'dry_run', ),
}

def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
Expand All @@ -91,7 +91,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
return updated

kwargs, ctrl_kwargs = partition(
lambda a: not a.keyword.value in self.CTRL_PARAMS,
lambda a: a.keyword.value not in self.CTRL_PARAMS,
kwargs
)

Expand Down
20 changes: 10 additions & 10 deletions tests/integration/goldens/redis/scripts/fixup_redis_v1_keywords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ def partition(
class redisCallTransformer(cst.CSTTransformer):
CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata')
METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
'create_instance': ('parent', 'instance_id', 'instance', ),
'delete_instance': ('name', ),
'export_instance': ('name', 'output_config', ),
'failover_instance': ('name', 'data_protection_mode', ),
'get_instance': ('name', ),
'import_instance': ('name', 'input_config', ),
'list_instances': ('parent', 'page_size', 'page_token', ),
'update_instance': ('update_mask', 'instance', ),
'upgrade_instance': ('name', 'redis_version', ),
'create_instance': ('parent', 'instance_id', 'instance', ),
'delete_instance': ('name', ),
'export_instance': ('name', 'output_config', ),
'failover_instance': ('name', 'data_protection_mode', ),
'get_instance': ('name', ),
'import_instance': ('name', 'input_config', ),
'list_instances': ('parent', 'page_size', 'page_token', ),
'update_instance': ('update_mask', 'instance', ),
'upgrade_instance': ('name', 'redis_version', ),
}

def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
Expand All @@ -66,7 +66,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:
return updated

kwargs, ctrl_kwargs = partition(
lambda a: not a.keyword.value in self.CTRL_PARAMS,
lambda a: a.keyword.value not in self.CTRL_PARAMS,
kwargs
)

Expand Down