Skip to content

Commit fe1e4cc

Browse files
jujubotjujubot
authored
Merge pull request #412 from hpidcock/fix-missing-facade
#412 - Update facade methods for Juju 2.8.0 - Fixes codegen for Python 3.7+ - Nested facade definitions are now deserialised properly (e.g. storage on ApplicationDeploy)
2 parents b5e1157 + 4d2895a commit fe1e4cc

26 files changed

Lines changed: 43140 additions & 395 deletions

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.1
1+
2.8.0

‎docs/changelog.rst‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
Changelog
22
---------
33

4+
2.8.0
5+
^^^^^
6+
7+
Wednesday May 13 2020
8+
9+
* Update facade methods for Juju 2.8.0
10+
* Fixes codegen for Python 3.7+
11+
* Nested facade definitions are now deserialised properly (e.g. storage on ApplicationDeploy)
12+
* Missing client facades are now ignored and a warning is printed (#382)
13+
* Add SCP example (#383)
14+
* Add watch_model_summaries method to Controller (#390)
15+
* Bug fix - make_archive on Model handles symlinks (#391 #392)
16+
* Add SSH support for units and machines (#393)
17+
* Add connection HA support (#402)
18+
* Bug fix - resolve api_endpoints from controller (#406 #407)
419

520
2.7.1
621
^^^^^

‎juju/client/_client.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@ class BundleFacade(TypeFactory):
140140
pass
141141

142142

143+
class CAASAdmissionFacade(TypeFactory):
144+
pass
145+
146+
143147
class CAASAgentFacade(TypeFactory):
144148
pass
145149

@@ -256,6 +260,10 @@ class ImageMetadataFacade(TypeFactory):
256260
pass
257261

258262

263+
class ImageMetadataManagerFacade(TypeFactory):
264+
pass
265+
266+
259267
class InstanceMutaterFacade(TypeFactory):
260268
pass
261269

‎juju/client/_client1.py‎

Lines changed: 382 additions & 60 deletions
Large diffs are not rendered by default.

‎juju/client/_client10.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ async def Get(self, application=None, branch=None):
996996
'''
997997
application : str
998998
branch : str
999-
Returns -> typing.Union[str, typing.Mapping[str, typing.Any], _ForwardRef('Value')]
999+
Returns -> typing.Union[str, typing.Mapping[str, typing.Any], ForwardRef('Value')]
10001000
'''
10011001
if application is not None and not isinstance(application, (bytes, str)):
10021002
raise Exception("Expected application to be a str, received: {}".format(type(application)))
@@ -1022,7 +1022,7 @@ async def GetCharmURL(self, application=None, branch=None):
10221022
'''
10231023
application : str
10241024
branch : str
1025-
Returns -> typing.Union[_ForwardRef('Error'), str]
1025+
Returns -> typing.Union[ForwardRef('Error'), str]
10261026
'''
10271027
if application is not None and not isinstance(application, (bytes, str)):
10281028
raise Exception("Expected application to be a str, received: {}".format(type(application)))
@@ -1876,6 +1876,7 @@ class ProvisionerFacade(Type):
18761876
'mac-address': {'type': 'string'},
18771877
'mtu': {'type': 'integer'},
18781878
'no-auto-start': {'type': 'boolean'},
1879+
'origin': {'type': 'string'},
18791880
'parent-interface-name': {'type': 'string'},
18801881
'provider-address-id': {'type': 'string'},
18811882
'provider-id': {'type': 'string'},
@@ -2357,7 +2358,7 @@ class ProvisionerFacade(Type):
23572358
async def APIAddresses(self):
23582359
'''
23592360
2360-
Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[str]]
2361+
Returns -> typing.Union[ForwardRef('Error'), typing.Sequence[str]]
23612362
'''
23622363

23632364
# map input types to rpc msg
@@ -2456,7 +2457,7 @@ async def Constraints(self, entities=None):
24562457
async def ContainerConfig(self):
24572458
'''
24582459
2459-
Returns -> typing.Union[_ForwardRef('UpdateBehavior'), str, _ForwardRef('Settings'), typing.Mapping[str, typing.Any], bool]
2460+
Returns -> typing.Union[ForwardRef('UpdateBehavior'), str, ForwardRef('Settings'), typing.Mapping[str, typing.Any], bool]
24602461
'''
24612462

24622463
# map input types to rpc msg
@@ -2604,7 +2605,7 @@ async def FindTools(self, agentstream=None, arch=None, major=None, minor=None, n
26042605
minor : int
26052606
number : Number
26062607
series : str
2607-
Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[~Tools]]
2608+
Returns -> typing.Union[ForwardRef('Error'), typing.Sequence[~Tools]]
26082609
'''
26092610
if agentstream is not None and not isinstance(agentstream, (bytes, str)):
26102611
raise Exception("Expected agentstream to be a str, received: {}".format(type(agentstream)))
@@ -2851,7 +2852,7 @@ async def ModelConfig(self):
28512852
async def ModelUUID(self):
28522853
'''
28532854
2854-
Returns -> typing.Union[_ForwardRef('Error'), str]
2855+
Returns -> typing.Union[ForwardRef('Error'), str]
28552856
'''
28562857

28572858
# map input types to rpc msg
@@ -3195,7 +3196,7 @@ async def SetSupportedContainers(self, params=None):
31953196
async def StateAddresses(self):
31963197
'''
31973198
3198-
Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[str]]
3199+
Returns -> typing.Union[ForwardRef('Error'), typing.Sequence[str]]
31993200
'''
32003201

32013202
# map input types to rpc msg
@@ -3298,7 +3299,7 @@ async def UpdateStatus(self, entities=None):
32983299
async def WatchAPIHostPorts(self):
32993300
'''
33003301
3301-
Returns -> typing.Union[str, _ForwardRef('Error')]
3302+
Returns -> typing.Union[str, ForwardRef('Error')]
33023303
'''
33033304

33043305
# map input types to rpc msg
@@ -3359,7 +3360,7 @@ async def WatchContainers(self, params=None):
33593360
async def WatchForModelConfigChanges(self):
33603361
'''
33613362
3362-
Returns -> typing.Union[str, _ForwardRef('Error')]
3363+
Returns -> typing.Union[str, ForwardRef('Error')]
33633364
'''
33643365

33653366
# map input types to rpc msg
@@ -3378,7 +3379,7 @@ async def WatchForModelConfigChanges(self):
33783379
async def WatchMachineErrorRetry(self):
33793380
'''
33803381
3381-
Returns -> typing.Union[str, _ForwardRef('Error')]
3382+
Returns -> typing.Union[str, ForwardRef('Error')]
33823383
'''
33833384

33843385
# map input types to rpc msg
@@ -3397,7 +3398,7 @@ async def WatchMachineErrorRetry(self):
33973398
async def WatchModelMachineStartTimes(self):
33983399
'''
33993400
3400-
Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error'), str]
3401+
Returns -> typing.Union[typing.Sequence[str], ForwardRef('Error'), str]
34013402
'''
34023403

34033404
# map input types to rpc msg
@@ -3416,7 +3417,7 @@ async def WatchModelMachineStartTimes(self):
34163417
async def WatchModelMachines(self):
34173418
'''
34183419
3419-
Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error'), str]
3420+
Returns -> typing.Union[typing.Sequence[str], ForwardRef('Error'), str]
34203421
'''
34213422

34223423
# map input types to rpc msg

‎juju/client/_client11.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ async def Get(self, application=None, branch=None):
10351035
'''
10361036
application : str
10371037
branch : str
1038-
Returns -> typing.Union[str, typing.Mapping[str, typing.Any], _ForwardRef('Value'), typing.Mapping[str, str]]
1038+
Returns -> typing.Union[str, typing.Mapping[str, typing.Any], ForwardRef('Value'), typing.Mapping[str, str]]
10391039
'''
10401040
if application is not None and not isinstance(application, (bytes, str)):
10411041
raise Exception("Expected application to be a str, received: {}".format(type(application)))
@@ -1061,7 +1061,7 @@ async def GetCharmURL(self, application=None, branch=None):
10611061
'''
10621062
application : str
10631063
branch : str
1064-
Returns -> typing.Union[_ForwardRef('Error'), str]
1064+
Returns -> typing.Union[ForwardRef('Error'), str]
10651065
'''
10661066
if application is not None and not isinstance(application, (bytes, str)):
10671067
raise Exception("Expected application to be a str, received: {}".format(type(application)))

‎juju/client/_client12.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@ class UniterFacade(Type):
973973
async def APIAddresses(self):
974974
'''
975975
976-
Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[str]]
976+
Returns -> typing.Union[ForwardRef('Error'), typing.Sequence[str]]
977977
'''
978978

979979
# map input types to rpc msg
@@ -1284,7 +1284,7 @@ async def ClosePorts(self, entities=None):
12841284
async def CloudAPIVersion(self):
12851285
'''
12861286
1287-
Returns -> typing.Union[_ForwardRef('Error'), str]
1287+
Returns -> typing.Union[ForwardRef('Error'), str]
12881288
'''
12891289

12901290
# map input types to rpc msg
@@ -1303,7 +1303,7 @@ async def CloudAPIVersion(self):
13031303
async def CloudSpec(self):
13041304
'''
13051305
1306-
Returns -> typing.Union[_ForwardRef('Error'), _ForwardRef('CloudSpec')]
1306+
Returns -> typing.Union[ForwardRef('Error'), ForwardRef('CloudSpec')]
13071307
'''
13081308

13091309
# map input types to rpc msg
@@ -1343,7 +1343,7 @@ async def ConfigSettings(self, entities=None):
13431343
async def CurrentModel(self):
13441344
'''
13451345
1346-
Returns -> typing.Union[_ForwardRef('Error'), str]
1346+
Returns -> typing.Union[ForwardRef('Error'), str]
13471347
'''
13481348

13491349
# map input types to rpc msg
@@ -1654,7 +1654,7 @@ async def ModelConfig(self):
16541654
async def ModelUUID(self):
16551655
'''
16561656
1657-
Returns -> typing.Union[_ForwardRef('Error'), str]
1657+
Returns -> typing.Union[ForwardRef('Error'), str]
16581658
'''
16591659

16601660
# map input types to rpc msg
@@ -1746,7 +1746,7 @@ async def PrivateAddress(self, entities=None):
17461746
async def ProviderType(self):
17471747
'''
17481748
1749-
Returns -> typing.Union[_ForwardRef('Error'), str]
1749+
Returns -> typing.Union[ForwardRef('Error'), str]
17501750
'''
17511751

17521752
# map input types to rpc msg
@@ -1996,7 +1996,7 @@ async def Resolved(self, entities=None):
19961996
async def SLALevel(self):
19971997
'''
19981998
1999-
Returns -> typing.Union[_ForwardRef('Error'), str]
1999+
Returns -> typing.Union[ForwardRef('Error'), str]
20002000
'''
20012001

20022002
# map input types to rpc msg
@@ -2351,7 +2351,7 @@ async def Watch(self, entities=None):
23512351
async def WatchAPIHostPorts(self):
23522352
'''
23532353
2354-
Returns -> typing.Union[str, _ForwardRef('Error')]
2354+
Returns -> typing.Union[str, ForwardRef('Error')]
23552355
'''
23562356

23572357
# map input types to rpc msg
@@ -2412,7 +2412,7 @@ async def WatchConfigSettingsHash(self, entities=None):
24122412
async def WatchForModelConfigChanges(self):
24132413
'''
24142414
2415-
Returns -> typing.Union[str, _ForwardRef('Error')]
2415+
Returns -> typing.Union[str, ForwardRef('Error')]
24162416
'''
24172417

24182418
# map input types to rpc msg

‎juju/client/_client13.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ class UniterFacade(Type):
998998
async def APIAddresses(self):
999999
'''
10001000
1001-
Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[str]]
1001+
Returns -> typing.Union[ForwardRef('Error'), typing.Sequence[str]]
10021002
'''
10031003

10041004
# map input types to rpc msg
@@ -1309,7 +1309,7 @@ async def ClosePorts(self, entities=None):
13091309
async def CloudAPIVersion(self):
13101310
'''
13111311
1312-
Returns -> typing.Union[_ForwardRef('Error'), str]
1312+
Returns -> typing.Union[ForwardRef('Error'), str]
13131313
'''
13141314

13151315
# map input types to rpc msg
@@ -1328,7 +1328,7 @@ async def CloudAPIVersion(self):
13281328
async def CloudSpec(self):
13291329
'''
13301330
1331-
Returns -> typing.Union[_ForwardRef('Error'), _ForwardRef('CloudSpec')]
1331+
Returns -> typing.Union[ForwardRef('Error'), ForwardRef('CloudSpec')]
13321332
'''
13331333

13341334
# map input types to rpc msg
@@ -1368,7 +1368,7 @@ async def ConfigSettings(self, entities=None):
13681368
async def CurrentModel(self):
13691369
'''
13701370
1371-
Returns -> typing.Union[_ForwardRef('Error'), str]
1371+
Returns -> typing.Union[ForwardRef('Error'), str]
13721372
'''
13731373

13741374
# map input types to rpc msg
@@ -1700,7 +1700,7 @@ async def ModelConfig(self):
17001700
async def ModelUUID(self):
17011701
'''
17021702
1703-
Returns -> typing.Union[_ForwardRef('Error'), str]
1703+
Returns -> typing.Union[ForwardRef('Error'), str]
17041704
'''
17051705

17061706
# map input types to rpc msg
@@ -1792,7 +1792,7 @@ async def PrivateAddress(self, entities=None):
17921792
async def ProviderType(self):
17931793
'''
17941794
1795-
Returns -> typing.Union[_ForwardRef('Error'), str]
1795+
Returns -> typing.Union[ForwardRef('Error'), str]
17961796
'''
17971797

17981798
# map input types to rpc msg
@@ -2042,7 +2042,7 @@ async def Resolved(self, entities=None):
20422042
async def SLALevel(self):
20432043
'''
20442044
2045-
Returns -> typing.Union[_ForwardRef('Error'), str]
2045+
Returns -> typing.Union[ForwardRef('Error'), str]
20462046
'''
20472047

20482048
# map input types to rpc msg
@@ -2418,7 +2418,7 @@ async def Watch(self, entities=None):
24182418
async def WatchAPIHostPorts(self):
24192419
'''
24202420
2421-
Returns -> typing.Union[str, _ForwardRef('Error')]
2421+
Returns -> typing.Union[str, ForwardRef('Error')]
24222422
'''
24232423

24242424
# map input types to rpc msg
@@ -2479,7 +2479,7 @@ async def WatchConfigSettingsHash(self, entities=None):
24792479
async def WatchForModelConfigChanges(self):
24802480
'''
24812481
2482-
Returns -> typing.Union[str, _ForwardRef('Error')]
2482+
Returns -> typing.Union[str, ForwardRef('Error')]
24832483
'''
24842484

24852485
# map input types to rpc msg

0 commit comments

Comments
 (0)