Skip to content

Commit 7acbbf2

Browse files
gkevinzhenggkevinzheng
committed
Fixed import statements and golden test post-merge
1 parent 55d0cca commit 7acbbf2

31 files changed

+2209
-11922
lines changed

‎gapic/schema/api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import os
2525
import sys
2626
from types import MappingProxyType
27-
from typing import Callable, Container, Dict, FrozenSet, Mapping, Optional, Sequence, Set, Tuple
27+
from typing import Callable, Container, Dict, FrozenSet, Iterable, Mapping, Optional, Sequence, Set, Tuple
2828
import yaml
2929

3030
from google.api_core import exceptions

‎tests/integration/goldens/redis/google/cloud/redis/__init__.py‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,59 +23,33 @@
2323

2424
from google.cloud.redis_v1.types.cloud_redis import CreateInstanceRequest
2525
from google.cloud.redis_v1.types.cloud_redis import DeleteInstanceRequest
26-
from google.cloud.redis_v1.types.cloud_redis import ExportInstanceRequest
27-
from google.cloud.redis_v1.types.cloud_redis import FailoverInstanceRequest
28-
from google.cloud.redis_v1.types.cloud_redis import GcsDestination
29-
from google.cloud.redis_v1.types.cloud_redis import GcsSource
30-
from google.cloud.redis_v1.types.cloud_redis import GetInstanceAuthStringRequest
3126
from google.cloud.redis_v1.types.cloud_redis import GetInstanceRequest
32-
from google.cloud.redis_v1.types.cloud_redis import ImportInstanceRequest
33-
from google.cloud.redis_v1.types.cloud_redis import InputConfig
3427
from google.cloud.redis_v1.types.cloud_redis import Instance
35-
from google.cloud.redis_v1.types.cloud_redis import InstanceAuthString
3628
from google.cloud.redis_v1.types.cloud_redis import ListInstancesRequest
3729
from google.cloud.redis_v1.types.cloud_redis import ListInstancesResponse
38-
from google.cloud.redis_v1.types.cloud_redis import LocationMetadata
3930
from google.cloud.redis_v1.types.cloud_redis import MaintenancePolicy
4031
from google.cloud.redis_v1.types.cloud_redis import MaintenanceSchedule
4132
from google.cloud.redis_v1.types.cloud_redis import NodeInfo
4233
from google.cloud.redis_v1.types.cloud_redis import OperationMetadata
43-
from google.cloud.redis_v1.types.cloud_redis import OutputConfig
4434
from google.cloud.redis_v1.types.cloud_redis import PersistenceConfig
45-
from google.cloud.redis_v1.types.cloud_redis import RescheduleMaintenanceRequest
4635
from google.cloud.redis_v1.types.cloud_redis import TlsCertificate
4736
from google.cloud.redis_v1.types.cloud_redis import UpdateInstanceRequest
48-
from google.cloud.redis_v1.types.cloud_redis import UpgradeInstanceRequest
4937
from google.cloud.redis_v1.types.cloud_redis import WeeklyMaintenanceWindow
50-
from google.cloud.redis_v1.types.cloud_redis import ZoneMetadata
5138

5239
__all__ = ('CloudRedisClient',
5340
'CloudRedisAsyncClient',
5441
'CreateInstanceRequest',
5542
'DeleteInstanceRequest',
56-
'ExportInstanceRequest',
57-
'FailoverInstanceRequest',
58-
'GcsDestination',
59-
'GcsSource',
60-
'GetInstanceAuthStringRequest',
6143
'GetInstanceRequest',
62-
'ImportInstanceRequest',
63-
'InputConfig',
6444
'Instance',
65-
'InstanceAuthString',
6645
'ListInstancesRequest',
6746
'ListInstancesResponse',
68-
'LocationMetadata',
6947
'MaintenancePolicy',
7048
'MaintenanceSchedule',
7149
'NodeInfo',
7250
'OperationMetadata',
73-
'OutputConfig',
7451
'PersistenceConfig',
75-
'RescheduleMaintenanceRequest',
7652
'TlsCertificate',
7753
'UpdateInstanceRequest',
78-
'UpgradeInstanceRequest',
7954
'WeeklyMaintenanceWindow',
80-
'ZoneMetadata',
8155
)

‎tests/integration/goldens/redis/google/cloud/redis_v1/__init__.py‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,60 +23,34 @@
2323

2424
from .types.cloud_redis import CreateInstanceRequest
2525
from .types.cloud_redis import DeleteInstanceRequest
26-
from .types.cloud_redis import ExportInstanceRequest
27-
from .types.cloud_redis import FailoverInstanceRequest
28-
from .types.cloud_redis import GcsDestination
29-
from .types.cloud_redis import GcsSource
30-
from .types.cloud_redis import GetInstanceAuthStringRequest
3126
from .types.cloud_redis import GetInstanceRequest
32-
from .types.cloud_redis import ImportInstanceRequest
33-
from .types.cloud_redis import InputConfig
3427
from .types.cloud_redis import Instance
35-
from .types.cloud_redis import InstanceAuthString
3628
from .types.cloud_redis import ListInstancesRequest
3729
from .types.cloud_redis import ListInstancesResponse
38-
from .types.cloud_redis import LocationMetadata
3930
from .types.cloud_redis import MaintenancePolicy
4031
from .types.cloud_redis import MaintenanceSchedule
4132
from .types.cloud_redis import NodeInfo
4233
from .types.cloud_redis import OperationMetadata
43-
from .types.cloud_redis import OutputConfig
4434
from .types.cloud_redis import PersistenceConfig
45-
from .types.cloud_redis import RescheduleMaintenanceRequest
4635
from .types.cloud_redis import TlsCertificate
4736
from .types.cloud_redis import UpdateInstanceRequest
48-
from .types.cloud_redis import UpgradeInstanceRequest
4937
from .types.cloud_redis import WeeklyMaintenanceWindow
50-
from .types.cloud_redis import ZoneMetadata
5138

5239
__all__ = (
5340
'CloudRedisAsyncClient',
5441
'CloudRedisClient',
5542
'CreateInstanceRequest',
5643
'DeleteInstanceRequest',
57-
'ExportInstanceRequest',
58-
'FailoverInstanceRequest',
59-
'GcsDestination',
60-
'GcsSource',
61-
'GetInstanceAuthStringRequest',
6244
'GetInstanceRequest',
63-
'ImportInstanceRequest',
64-
'InputConfig',
6545
'Instance',
66-
'InstanceAuthString',
6746
'ListInstancesRequest',
6847
'ListInstancesResponse',
69-
'LocationMetadata',
7048
'MaintenancePolicy',
7149
'MaintenanceSchedule',
7250
'NodeInfo',
7351
'OperationMetadata',
74-
'OutputConfig',
7552
'PersistenceConfig',
76-
'RescheduleMaintenanceRequest',
7753
'TlsCertificate',
7854
'UpdateInstanceRequest',
79-
'UpgradeInstanceRequest',
8055
'WeeklyMaintenanceWindow',
81-
'ZoneMetadata',
8256
)

‎tests/integration/goldens/redis/google/cloud/redis_v1/gapic_metadata.json‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -20,50 +20,20 @@
2020
"delete_instance"
2121
]
2222
},
23-
"ExportInstance": {
24-
"methods": [
25-
"export_instance"
26-
]
27-
},
28-
"FailoverInstance": {
29-
"methods": [
30-
"failover_instance"
31-
]
32-
},
3323
"GetInstance": {
3424
"methods": [
3525
"get_instance"
3626
]
3727
},
38-
"GetInstanceAuthString": {
39-
"methods": [
40-
"get_instance_auth_string"
41-
]
42-
},
43-
"ImportInstance": {
44-
"methods": [
45-
"import_instance"
46-
]
47-
},
4828
"ListInstances": {
4929
"methods": [
5030
"list_instances"
5131
]
5232
},
53-
"RescheduleMaintenance": {
54-
"methods": [
55-
"reschedule_maintenance"
56-
]
57-
},
5833
"UpdateInstance": {
5934
"methods": [
6035
"update_instance"
6136
]
62-
},
63-
"UpgradeInstance": {
64-
"methods": [
65-
"upgrade_instance"
66-
]
6737
}
6838
}
6939
},
@@ -80,50 +50,20 @@
8050
"delete_instance"
8151
]
8252
},
83-
"ExportInstance": {
84-
"methods": [
85-
"export_instance"
86-
]
87-
},
88-
"FailoverInstance": {
89-
"methods": [
90-
"failover_instance"
91-
]
92-
},
9353
"GetInstance": {
9454
"methods": [
9555
"get_instance"
9656
]
9757
},
98-
"GetInstanceAuthString": {
99-
"methods": [
100-
"get_instance_auth_string"
101-
]
102-
},
103-
"ImportInstance": {
104-
"methods": [
105-
"import_instance"
106-
]
107-
},
10858
"ListInstances": {
10959
"methods": [
11060
"list_instances"
11161
]
11262
},
113-
"RescheduleMaintenance": {
114-
"methods": [
115-
"reschedule_maintenance"
116-
]
117-
},
11863
"UpdateInstance": {
11964
"methods": [
12065
"update_instance"
12166
]
122-
},
123-
"UpgradeInstance": {
124-
"methods": [
125-
"upgrade_instance"
126-
]
12767
}
12868
}
12969
},
@@ -140,50 +80,20 @@
14080
"delete_instance"
14181
]
14282
},
143-
"ExportInstance": {
144-
"methods": [
145-
"export_instance"
146-
]
147-
},
148-
"FailoverInstance": {
149-
"methods": [
150-
"failover_instance"
151-
]
152-
},
15383
"GetInstance": {
15484
"methods": [
15585
"get_instance"
15686
]
15787
},
158-
"GetInstanceAuthString": {
159-
"methods": [
160-
"get_instance_auth_string"
161-
]
162-
},
163-
"ImportInstance": {
164-
"methods": [
165-
"import_instance"
166-
]
167-
},
16888
"ListInstances": {
16989
"methods": [
17090
"list_instances"
17191
]
17292
},
173-
"RescheduleMaintenance": {
174-
"methods": [
175-
"reschedule_maintenance"
176-
]
177-
},
17893
"UpdateInstance": {
17994
"methods": [
18095
"update_instance"
18196
]
182-
},
183-
"UpgradeInstance": {
184-
"methods": [
185-
"upgrade_instance"
186-
]
18797
}
18898
}
18999
}

0 commit comments

Comments
 (0)