address feedback

Author: ohmayr

packages/gapic-generator/gapic/schema/wrappers.py

@@ -2346,8 +2346,8 @@ def gen_indirect_resources_used(message):
                     f"Resources '{incumbent.resource_type_full_path}' and '{msg.resource_type_full_path}' "
                     f"both flatten to the exact same method name.\n"
                     f"To protect backward compatibility, explicitly alias one of these using "
-                    f"the `--resource-name-aliases` CLI parameter.\n"
-                    f"Example: --resource-name-aliases='{{\"{msg.resource_type_full_path}\": \"CustomName\"}}'\n"
+                    f"the `--resource-name-alias` CLI parameter.\n"
+                    f"Example: --resource-name-alias={msg.resource_type_full_path}:CustomName\n"
                 )
             seen_types[res_type] = msg
 

packages/gapic-generator/gapic/utils/options.py

@@ -74,7 +74,7 @@ class Options:
             # For example, 'google.cloud.api.v1+google.cloud.anotherapi.v2'
             "proto-plus-deps",
             "gapic-version",  # A version string following https://peps.python.org/pep-0440
-            "resource-name-aliases",
+            "resource-name-alias",
         )
     )
 
@@ -191,14 +191,12 @@ def tweak_path(p):
             proto_plus_deps = tuple(proto_plus_deps[0].split("+"))
 
         resource_name_aliases = {}
-        resource_alias_strings = opts.pop("resource-name-aliases", None)
-        if resource_alias_strings:
+        for alias_mapping in opts.pop("resource-name-alias", []):
             try:
-                # Strip single quotes that survive the Bazel/Shell transition
-                raw_string = resource_alias_strings[-1].strip("'")
-                resource_name_aliases = json.loads(raw_string)
-            except json.JSONDecodeError as e:
-                warnings.warn(f"Failed to parse resource-name-aliases JSON: {e} from string: {resource_alias_strings[-1]}")
+                res_path, alias_name = alias_mapping.split(":", 1)
+                resource_name_aliases[res_path.strip()] = alias_name.strip()
+            except ValueError:
+                warnings.warn(f"Invalid format for resource-name-alias: '{alias_mapping}'. Expected format 'resource.path/Name:AliasName'")
 
         Options.resource_name_aliases_global = resource_name_aliases