Skip to content

Commit 2c4f25e

Browse files
author
Juan Tirado
committed
Remove old client workaround.
1 parent fd89d1a commit 2c4f25e

72 files changed

Lines changed: 157 additions & 1425166 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/tox.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ jobs:
99
strategy:
1010
matrix:
1111
python:
12-
- "3.6"
13-
- "3.7"
1412
- "3.8"
1513
- "3.9"
1614
- "3.10"
@@ -31,8 +29,6 @@ jobs:
3129
strategy:
3230
matrix:
3331
python:
34-
- "3.6"
35-
- "3.7"
3632
- "3.8"
3733
- "3.9"
3834
- "3.10"

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.4
1+
3.1.0-beta1

‎examples/fullstatus.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from juju import jasyncio
22
from juju.model import Model
33

4-
54
async def status():
65
model = Model()
76
await model.connect()

‎juju/client/_client.py‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,21 @@
44
from juju.client._definitions import *
55

66

7-
from juju.client import _client7, _client1, _client3, _client2, _client14, _client4, _client6, _client5, _client11, _client9, _client18, _client8, _client15
7+
from juju.client import _client7, _client1, _client3, _client4, _client2, _client15, _client6, _client5, _client11, _client9, _client18
88

99

1010
CLIENTS = {
1111
"7": _client7,
1212
"1": _client1,
1313
"3": _client3,
14-
"2": _client2,
15-
"14": _client14,
1614
"4": _client4,
15+
"2": _client2,
16+
"15": _client15,
1717
"6": _client6,
1818
"5": _client5,
1919
"11": _client11,
2020
"9": _client9,
21-
"18": _client18,
22-
"8": _client8,
23-
"15": _client15
21+
"18": _client18
2422
}
2523

2624

@@ -154,10 +152,6 @@ class CAASApplicationProvisionerFacade(TypeFactory):
154152
pass
155153

156154

157-
class CAASFirewallerEmbeddedFacade(TypeFactory):
158-
pass
159-
160-
161155
class CAASFirewallerFacade(TypeFactory):
162156
pass
163157

@@ -194,10 +188,6 @@ class CharmDownloaderFacade(TypeFactory):
194188
pass
195189

196190

197-
class CharmHubFacade(TypeFactory):
198-
pass
199-
200-
201191
class CharmRevisionUpdaterFacade(TypeFactory):
202192
pass
203193

@@ -286,10 +276,6 @@ class HostKeyReporterFacade(TypeFactory):
286276
pass
287277

288278

289-
class ImageManagerFacade(TypeFactory):
290-
pass
291-
292-
293279
class ImageMetadataFacade(TypeFactory):
294280
pass
295281

@@ -462,10 +448,6 @@ class ResourcesHookContextFacade(TypeFactory):
462448
pass
463449

464450

465-
class ResumerFacade(TypeFactory):
466-
pass
467-
468-
469451
class RetryStrategyFacade(TypeFactory):
470452
pass
471453

@@ -482,10 +464,6 @@ class SecretsManagerFacade(TypeFactory):
482464
pass
483465

484466

485-
class SecretsRotationWatcherFacade(TypeFactory):
486-
pass
487-
488-
489467
class SecretsTriggerWatcherFacade(TypeFactory):
490468
pass
491469

‎juju/client/_client1.py‎

Lines changed: 1 addition & 854 deletions
Large diffs are not rendered by default.

‎juju/client/_client11.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,15 @@ class ControllerFacade(Type):
8181
'type': 'object'},
8282
'DashboardConnectionInfo': {'additionalProperties': False,
8383
'properties': {'error': {'$ref': '#/definitions/Error'},
84-
'proxy-connection': {'$ref': '#/definitions/DashboardConnectionProxy'},
84+
'proxy-connection': {'$ref': '#/definitions/Proxy'},
8585
'ssh-connection': {'$ref': '#/definitions/DashboardConnectionSSHTunnel'}},
8686
'required': ['proxy-connection',
8787
'ssh-connection'],
8888
'type': 'object'},
89-
'DashboardConnectionProxy': {'additionalProperties': False,
90-
'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
91-
'type': 'object'}},
92-
'type': 'object'},
93-
'type': {'type': 'string'}},
94-
'required': ['config', 'type'],
95-
'type': 'object'},
9689
'DashboardConnectionSSHTunnel': {'additionalProperties': False,
97-
'properties': {'host': {'type': 'string'},
90+
'properties': {'entity': {'type': 'string'},
91+
'host': {'type': 'string'},
92+
'model': {'type': 'string'},
9893
'port': {'type': 'string'}},
9994
'required': ['host', 'port'],
10095
'type': 'object'},
@@ -299,6 +294,13 @@ class ControllerFacade(Type):
299294
'type': 'array'}},
300295
'required': ['results'],
301296
'type': 'object'},
297+
'Proxy': {'additionalProperties': False,
298+
'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True,
299+
'type': 'object'}},
300+
'type': 'object'},
301+
'type': {'type': 'string'}},
302+
'required': ['config', 'type'],
303+
'type': 'object'},
302304
'RemoveBlocksArgs': {'additionalProperties': False,
303305
'properties': {'all': {'type': 'boolean'}},
304306
'required': ['all'],

‎juju/client/_client18.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ class UniterFacade(Type):
334334
'GetSecretContentArg': {'additionalProperties': False,
335335
'properties': {'label': {'type': 'string'},
336336
'peek': {'type': 'boolean'},
337-
'update': {'type': 'boolean'},
337+
'refresh': {'type': 'boolean'},
338338
'uri': {'type': 'string'}},
339339
'required': ['uri'],
340340
'type': 'object'},

0 commit comments

Comments
 (0)