Merge branch 'selective-gapic-p1' of github.com:googleapis/gapic-gene…

…rator-python into selective-gapic-p1
googleapis · Dec 11, 2024 · 8f9db43 · 8f9db43
2 parents 27349ef + 7a3b71e
commit 8f9db43
Show file tree

Hide file tree

Showing 31 changed files with 2,416 additions and 13,575 deletions.
diff --git a/gapic/schema/api.py b/gapic/schema/api.py
@@ -24,7 +24,7 @@
 import os
 import sys
 from types import MappingProxyType
-from typing import Callable, Container, Dict, FrozenSet, Mapping, Optional, Sequence, Set, Tuple
+from typing import Callable, Container, Dict, FrozenSet, Iterable, Mapping, Optional, Sequence, Set, Tuple
 import yaml
 
 from google.api_core import exceptions

diff --git a/tests/integration/goldens/redis/google/cloud/redis/__init__.py b/tests/integration/goldens/redis/google/cloud/redis/__init__.py
@@ -23,59 +23,33 @@
 
 from google.cloud.redis_v1.types.cloud_redis import CreateInstanceRequest
 from google.cloud.redis_v1.types.cloud_redis import DeleteInstanceRequest
-from google.cloud.redis_v1.types.cloud_redis import ExportInstanceRequest
-from google.cloud.redis_v1.types.cloud_redis import FailoverInstanceRequest
-from google.cloud.redis_v1.types.cloud_redis import GcsDestination
-from google.cloud.redis_v1.types.cloud_redis import GcsSource
-from google.cloud.redis_v1.types.cloud_redis import GetInstanceAuthStringRequest
 from google.cloud.redis_v1.types.cloud_redis import GetInstanceRequest
-from google.cloud.redis_v1.types.cloud_redis import ImportInstanceRequest
-from google.cloud.redis_v1.types.cloud_redis import InputConfig
 from google.cloud.redis_v1.types.cloud_redis import Instance
-from google.cloud.redis_v1.types.cloud_redis import InstanceAuthString
 from google.cloud.redis_v1.types.cloud_redis import ListInstancesRequest
 from google.cloud.redis_v1.types.cloud_redis import ListInstancesResponse
-from google.cloud.redis_v1.types.cloud_redis import LocationMetadata
 from google.cloud.redis_v1.types.cloud_redis import MaintenancePolicy
 from google.cloud.redis_v1.types.cloud_redis import MaintenanceSchedule
 from google.cloud.redis_v1.types.cloud_redis import NodeInfo
 from google.cloud.redis_v1.types.cloud_redis import OperationMetadata
-from google.cloud.redis_v1.types.cloud_redis import OutputConfig
 from google.cloud.redis_v1.types.cloud_redis import PersistenceConfig
-from google.cloud.redis_v1.types.cloud_redis import RescheduleMaintenanceRequest
 from google.cloud.redis_v1.types.cloud_redis import TlsCertificate
 from google.cloud.redis_v1.types.cloud_redis import UpdateInstanceRequest
-from google.cloud.redis_v1.types.cloud_redis import UpgradeInstanceRequest
 from google.cloud.redis_v1.types.cloud_redis import WeeklyMaintenanceWindow
-from google.cloud.redis_v1.types.cloud_redis import ZoneMetadata
 
 __all__ = ('CloudRedisClient',
     'CloudRedisAsyncClient',
     'CreateInstanceRequest',
     'DeleteInstanceRequest',
-    'ExportInstanceRequest',
-    'FailoverInstanceRequest',
-    'GcsDestination',
-    'GcsSource',
-    'GetInstanceAuthStringRequest',
     'GetInstanceRequest',
-    'ImportInstanceRequest',
-    'InputConfig',
     'Instance',
-    'InstanceAuthString',
     'ListInstancesRequest',
     'ListInstancesResponse',
-    'LocationMetadata',
     'MaintenancePolicy',
     'MaintenanceSchedule',
     'NodeInfo',
     'OperationMetadata',
-    'OutputConfig',
     'PersistenceConfig',
-    'RescheduleMaintenanceRequest',
     'TlsCertificate',
     'UpdateInstanceRequest',
-    'UpgradeInstanceRequest',
     'WeeklyMaintenanceWindow',
-    'ZoneMetadata',
 )
diff --git a/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py b/tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py
@@ -23,60 +23,34 @@
 
 from .types.cloud_redis import CreateInstanceRequest
 from .types.cloud_redis import DeleteInstanceRequest
-from .types.cloud_redis import ExportInstanceRequest
-from .types.cloud_redis import FailoverInstanceRequest
-from .types.cloud_redis import GcsDestination
-from .types.cloud_redis import GcsSource
-from .types.cloud_redis import GetInstanceAuthStringRequest
 from .types.cloud_redis import GetInstanceRequest
-from .types.cloud_redis import ImportInstanceRequest
-from .types.cloud_redis import InputConfig
 from .types.cloud_redis import Instance
-from .types.cloud_redis import InstanceAuthString
 from .types.cloud_redis import ListInstancesRequest
 from .types.cloud_redis import ListInstancesResponse
-from .types.cloud_redis import LocationMetadata
 from .types.cloud_redis import MaintenancePolicy
 from .types.cloud_redis import MaintenanceSchedule
 from .types.cloud_redis import NodeInfo
 from .types.cloud_redis import OperationMetadata
-from .types.cloud_redis import OutputConfig
 from .types.cloud_redis import PersistenceConfig
-from .types.cloud_redis import RescheduleMaintenanceRequest
 from .types.cloud_redis import TlsCertificate
 from .types.cloud_redis import UpdateInstanceRequest
-from .types.cloud_redis import UpgradeInstanceRequest
 from .types.cloud_redis import WeeklyMaintenanceWindow
-from .types.cloud_redis import ZoneMetadata
 
 __all__ = (
     'CloudRedisAsyncClient',
 'CloudRedisClient',
 'CreateInstanceRequest',
 'DeleteInstanceRequest',
-'ExportInstanceRequest',
-'FailoverInstanceRequest',
-'GcsDestination',
-'GcsSource',
-'GetInstanceAuthStringRequest',
 'GetInstanceRequest',
-'ImportInstanceRequest',
-'InputConfig',
 'Instance',
-'InstanceAuthString',
 'ListInstancesRequest',
 'ListInstancesResponse',
-'LocationMetadata',
 'MaintenancePolicy',
 'MaintenanceSchedule',
 'NodeInfo',
 'OperationMetadata',
-'OutputConfig',
 'PersistenceConfig',
-'RescheduleMaintenanceRequest',
 'TlsCertificate',
 'UpdateInstanceRequest',
-'UpgradeInstanceRequest',
 'WeeklyMaintenanceWindow',
-'ZoneMetadata',
 )
diff --git a/tests/integration/goldens/redis/google/cloud/redis_v1/gapic_metadata.json b/tests/integration/goldens/redis/google/cloud/redis_v1/gapic_metadata.json
@@ -20,50 +20,20 @@
                 "delete_instance"
               ]
             },
-            "ExportInstance": {
-              "methods": [
-                "export_instance"
-              ]
-            },
-            "FailoverInstance": {
-              "methods": [
-                "failover_instance"
-              ]
-            },
             "GetInstance": {
               "methods": [
                 "get_instance"
               ]
             },
-            "GetInstanceAuthString": {
-              "methods": [
-                "get_instance_auth_string"
-              ]
-            },
-            "ImportInstance": {
-              "methods": [
-                "import_instance"
-              ]
-            },
             "ListInstances": {
               "methods": [
                 "list_instances"
               ]
             },
-            "RescheduleMaintenance": {
-              "methods": [
-                "reschedule_maintenance"
-              ]
-            },
             "UpdateInstance": {
               "methods": [
                 "update_instance"
               ]
-            },
-            "UpgradeInstance": {
-              "methods": [
-                "upgrade_instance"
-              ]
             }
           }
         },
@@ -80,50 +50,20 @@
                 "delete_instance"
               ]
             },
-            "ExportInstance": {
-              "methods": [
-                "export_instance"
-              ]
-            },
-            "FailoverInstance": {
-              "methods": [
-                "failover_instance"
-              ]
-            },
             "GetInstance": {
               "methods": [
                 "get_instance"
               ]
             },
-            "GetInstanceAuthString": {
-              "methods": [
-                "get_instance_auth_string"
-              ]
-            },
-            "ImportInstance": {
-              "methods": [
-                "import_instance"
-              ]
-            },
             "ListInstances": {
               "methods": [
                 "list_instances"
               ]
             },
-            "RescheduleMaintenance": {
-              "methods": [
-                "reschedule_maintenance"
-              ]
-            },
             "UpdateInstance": {
               "methods": [
                 "update_instance"
               ]
-            },
-            "UpgradeInstance": {
-              "methods": [
-                "upgrade_instance"
-              ]
             }
           }
         },
@@ -140,50 +80,20 @@
                 "delete_instance"
               ]
             },
-            "ExportInstance": {
-              "methods": [
-                "export_instance"
-              ]
-            },
-            "FailoverInstance": {
-              "methods": [
-                "failover_instance"
-              ]
-            },
             "GetInstance": {
               "methods": [
                 "get_instance"
               ]
             },
-            "GetInstanceAuthString": {
-              "methods": [
-                "get_instance_auth_string"
-              ]
-            },
-            "ImportInstance": {
-              "methods": [
-                "import_instance"
-              ]
-            },
             "ListInstances": {
               "methods": [
                 "list_instances"
               ]
             },
-            "RescheduleMaintenance": {
-              "methods": [
-                "reschedule_maintenance"
-              ]
-            },
             "UpdateInstance": {
               "methods": [
                 "update_instance"
               ]
-            },
-            "UpgradeInstance": {
-              "methods": [
-                "upgrade_instance"
-              ]
             }
           }
         }