fix(snippetgen): remove special handling for resource paths

gapic/samplegen/samplegen.py

@@ -928,37 +928,6 @@ def parse_handwritten_specs(sample_configs: Sequence[str]) -> Generator[Dict[str
                     yield spec
 
 
-def _generate_resource_path_request_object(field_name: str, message: wrappers.MessageType) -> List[Dict[str, str]]:
-    """Given a message that represents a resource, generate request objects that 
-    populate the resource path args.
-
-    Args:
-        field_name (str): The name of the field.
-        message (wrappers.MessageType): The message the field belongs to.
-
-    Returns:
-        List[Dict[str, str]]: A list of dicts that can be turned into TransformedRequests.
-    """
-    request = []
-
-    # Look for specific field names to substitute more realistic values
-    special_values_dict = {
-        "project": '"my-project-id"',
-        "location": '"us-central1"'
-    }
-
-    for resource_path_arg in message.resource_path_args:
-        value = special_values_dict.get(
-            resource_path_arg, f'"{resource_path_arg}_value"')
-        request.append({
-            # See TransformedRequest.build() for how 'field' is parsed
-            "field": f"{field_name}%{resource_path_arg}",
-            "value": value,
-        })
-
-    return request
-
-
 def generate_request_object(api_schema: api.API, service: wrappers.Service, message: wrappers.MessageType, field_name_prefix: str = ""):
     """Generate dummy input for a given message.
 
@@ -993,18 +962,8 @@ def generate_request_object(api_schema: api.API, service: wrappers.Service, mess
 
         # TODO(busunkim): Properly handle map fields
         if field.is_primitive:
-            resource_reference_message = service.resource_messages_dict.get(
-                field.resource_reference)
-            # Some resource patterns have no resource_path_args
-            # https://github.com/googleapis/gapic-generator-python/issues/701
-            if resource_reference_message and resource_reference_message.resource_path_args:
-                request += _generate_resource_path_request_object(
-                    field_name,
-                    resource_reference_message
-                )
-            else:
-                request.append(
-                    {"field": field_name, "value": field.mock_value_original_type})
+            request.append(
+                {"field": field_name, "value": field.mock_value_original_type})
         elif field.enum:
             # Choose the last enum value in the list since index 0 is often "unspecified"
             request.append(

tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/async_client.py

@@ -619,12 +619,8 @@ def sample_get_feed():
                 client = asset_v1.AssetServiceClient()
 
                 # Initialize request argument(s)
-                project = "my-project-id"
-                feed = "feed_value"
-                name = f"projects/{project}/feeds/{feed}"
-
                 request = asset_v1.GetFeedRequest(
-                    name=name,
+                    name="name_value",
                 )
 
                 # Make the request
@@ -938,12 +934,8 @@ def sample_delete_feed():
                 client = asset_v1.AssetServiceClient()
 
                 # Initialize request argument(s)
-                project = "my-project-id"
-                feed = "feed_value"
-                name = f"projects/{project}/feeds/{feed}"
-
                 request = asset_v1.DeleteFeedRequest(
-                    name=name,
+                    name="name_value",
                 )
 
                 # Make the request

tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py

@@ -815,12 +815,8 @@ def sample_get_feed():
                 client = asset_v1.AssetServiceClient()
 
                 # Initialize request argument(s)
-                project = "my-project-id"
-                feed = "feed_value"
-                name = f"projects/{project}/feeds/{feed}"
-
                 request = asset_v1.GetFeedRequest(
-                    name=name,
+                    name="name_value",
                 )
 
                 # Make the request
@@ -1123,12 +1119,8 @@ def sample_delete_feed():
                 client = asset_v1.AssetServiceClient()
 
                 # Initialize request argument(s)
-                project = "my-project-id"
-                feed = "feed_value"
-                name = f"projects/{project}/feeds/{feed}"
-
                 request = asset_v1.DeleteFeedRequest(
-                    name=name,
+                    name="name_value",
                 )
 
                 # Make the request

tests/integration/goldens/asset/samples/generated_samples/cloudasset_generated_asset_v1_asset_service_delete_feed_async.py

@@ -32,12 +32,8 @@ async def sample_delete_feed():
     client = asset_v1.AssetServiceAsyncClient()
 
     # Initialize request argument(s)
-    project = "my-project-id"
-    feed = "feed_value"
-    name = f"projects/{project}/feeds/{feed}"
-
     request = asset_v1.DeleteFeedRequest(
-        name=name,
+        name="name_value",
     )
 
     # Make the request

tests/integration/goldens/asset/samples/generated_samples/cloudasset_generated_asset_v1_asset_service_delete_feed_sync.py

@@ -32,12 +32,8 @@ def sample_delete_feed():
     client = asset_v1.AssetServiceClient()
 
     # Initialize request argument(s)
-    project = "my-project-id"
-    feed = "feed_value"
-    name = f"projects/{project}/feeds/{feed}"
-
     request = asset_v1.DeleteFeedRequest(
-        name=name,
+        name="name_value",
     )
 
     # Make the request

tests/integration/goldens/asset/samples/generated_samples/cloudasset_generated_asset_v1_asset_service_get_feed_async.py

@@ -32,12 +32,8 @@ async def sample_get_feed():
     client = asset_v1.AssetServiceAsyncClient()
 
     # Initialize request argument(s)
-    project = "my-project-id"
-    feed = "feed_value"
-    name = f"projects/{project}/feeds/{feed}"
-
     request = asset_v1.GetFeedRequest(
-        name=name,
+        name="name_value",
     )
 
     # Make the request

tests/integration/goldens/asset/samples/generated_samples/cloudasset_generated_asset_v1_asset_service_get_feed_sync.py

@@ -32,12 +32,8 @@ def sample_get_feed():
     client = asset_v1.AssetServiceClient()
 
     # Initialize request argument(s)
-    project = "my-project-id"
-    feed = "feed_value"
-    name = f"projects/{project}/feeds/{feed}"
-
     request = asset_v1.GetFeedRequest(
-        name=name,
+        name="name_value",
     )
 
     # Make the request

tests/integration/goldens/asset/samples/generated_samples/snippet_metadata_asset_v1.json

@@ -366,12 +366,12 @@
       "regionTag": "cloudasset_generated_asset_v1_AssetService_DeleteFeed_async",
       "segments": [
         {
-          "end": 46,
+          "end": 42,
           "start": 27,
           "type": "FULL"
         },
         {
-          "end": 46,
+          "end": 42,
           "start": 27,
           "type": "SHORT"
         },
@@ -381,16 +381,16 @@
           "type": "CLIENT_INITIALIZATION"
         },
         {
-          "end": 42,
+          "end": 38,
           "start": 34,
           "type": "REQUEST_INITIALIZATION"
         },
         {
-          "start": 43,
+          "start": 39,
           "type": "REQUEST_EXECUTION"
         },
         {
-          "end": 47,
+          "end": 43,
           "type": "RESPONSE_HANDLING"
         }
       ]
@@ -408,12 +408,12 @@
       "regionTag": "cloudasset_generated_asset_v1_AssetService_DeleteFeed_sync",
       "segments": [
         {
-          "end": 46,
+          "end": 42,
           "start": 27,
           "type": "FULL"
         },
         {
-          "end": 46,
+          "end": 42,
           "start": 27,
           "type": "SHORT"
         },
@@ -423,16 +423,16 @@
           "type": "CLIENT_INITIALIZATION"
         },
         {
-          "end": 42,
+          "end": 38,
           "start": 34,
           "type": "REQUEST_INITIALIZATION"
         },
         {
-          "start": 43,
+          "start": 39,
           "type": "REQUEST_EXECUTION"
         },
         {
-          "end": 47,
+          "end": 43,
           "type": "RESPONSE_HANDLING"
         }
       ]
@@ -536,12 +536,12 @@
       "regionTag": "cloudasset_generated_asset_v1_AssetService_GetFeed_async",
       "segments": [
         {
-          "end": 48,
+          "end": 44,
           "start": 27,
           "type": "FULL"
         },
         {
-          "end": 48,
+          "end": 44,
           "start": 27,
           "type": "SHORT"
         },
@@ -551,18 +551,18 @@
           "type": "CLIENT_INITIALIZATION"
         },
         {
-          "end": 42,
+          "end": 38,
           "start": 34,
           "type": "REQUEST_INITIALIZATION"
         },
         {
-          "end": 45,
-          "start": 43,
+          "end": 41,
+          "start": 39,
           "type": "REQUEST_EXECUTION"
         },
         {
-          "end": 49,
-          "start": 46,
+          "end": 45,
+          "start": 42,
           "type": "RESPONSE_HANDLING"
         }
       ]
@@ -580,12 +580,12 @@
       "regionTag": "cloudasset_generated_asset_v1_AssetService_GetFeed_sync",
       "segments": [
         {
-          "end": 48,
+          "end": 44,
           "start": 27,
           "type": "FULL"
         },
         {
-          "end": 48,
+          "end": 44,
           "start": 27,
           "type": "SHORT"
         },
@@ -595,18 +595,18 @@
           "type": "CLIENT_INITIALIZATION"
         },
         {
-          "end": 42,
+          "end": 38,
           "start": 34,
           "type": "REQUEST_INITIALIZATION"
         },
         {
-          "end": 45,
-          "start": 43,
+          "end": 41,
+          "start": 39,
           "type": "REQUEST_EXECUTION"
         },
         {
-          "end": 49,
-          "start": 46,
+          "end": 45,
+          "start": 42,
           "type": "RESPONSE_HANDLING"
         }
       ]

tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/async_client.py

@@ -218,12 +218,8 @@ def sample_generate_access_token():
                 client = credentials_v1.IAMCredentialsClient()
 
                 # Initialize request argument(s)
-                project = "my-project-id"
-                service_account = "service_account_value"
-                name = f"projects/{project}/serviceAccounts/{service_account}"
-
                 request = credentials_v1.GenerateAccessTokenRequest(
-                    name=name,
+                    name="name_value",
                     scope=['scope_value_1', 'scope_value_2'],
                 )
 
@@ -376,12 +372,8 @@ def sample_generate_id_token():
                 client = credentials_v1.IAMCredentialsClient()
 
                 # Initialize request argument(s)
-                project = "my-project-id"
-                service_account = "service_account_value"
-                name = f"projects/{project}/serviceAccounts/{service_account}"
-
                 request = credentials_v1.GenerateIdTokenRequest(
-                    name=name,
+                    name="name_value",
                     audience="audience_value",
                 )
 
@@ -527,12 +519,8 @@ def sample_sign_blob():
                 client = credentials_v1.IAMCredentialsClient()
 
                 # Initialize request argument(s)
-                project = "my-project-id"
-                service_account = "service_account_value"
-                name = f"projects/{project}/serviceAccounts/{service_account}"
-
                 request = credentials_v1.SignBlobRequest(
-                    name=name,
+                    name="name_value",
                     payload=b'payload_blob',
                 )
 
@@ -665,12 +653,8 @@ def sample_sign_jwt():
                 client = credentials_v1.IAMCredentialsClient()
 
                 # Initialize request argument(s)
-                project = "my-project-id"
-                service_account = "service_account_value"
-                name = f"projects/{project}/serviceAccounts/{service_account}"
-
                 request = credentials_v1.SignJwtRequest(
-                    name=name,
+                    name="name_value",
                     payload="payload_value",
                 )