Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ jobs:
# - "3.9"
- "3.10"
juju:
- "3.1/stable"
- "3.3/stable"
- "3.4/stable"
- "3.5/stable"
- "3.6/stable"
new_wait_for_idle:
Expand Down Expand Up @@ -134,9 +131,6 @@ jobs:
python:
- "3.10"
juju:
- "3.1/stable"
- "3.3/stable"
- "3.4/stable"
- "3.5/stable"
- "3.6/stable"
steps:
Expand Down
14 changes: 2 additions & 12 deletions juju/client/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
_client6,
_client7,
_client8,
_client9,
_client10,
_client11,
_client12,
_client17,
_client19,
_client20,
)
from juju.client._definitions import *
Expand All @@ -25,15 +22,12 @@
"3": _client3,
"4": _client4,
"2": _client2,
"17": _client17,
"20": _client20,
"5": _client5,
"6": _client6,
"11": _client11,
"1": _client1,
"10": _client10,
"9": _client9,
"5": _client5,
"19": _client19,
"20": _client20,
"8": _client8,
"12": _client12,
}
Expand Down Expand Up @@ -156,10 +150,6 @@ class FacadeVersions(TypeFactory):
pass


class FirewallRulesFacade(TypeFactory):
pass


class HighAvailabilityFacade(TypeFactory):
pass

Expand Down
70 changes: 0 additions & 70 deletions juju/client/_client1.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,45 +32,6 @@ async def InvalidateModelCredential(self, reason=None):
return reply


class FirewallRulesFacade(Type):
name = "FirewallRules"
version = 1

@ReturnMapping(ListFirewallRulesResults)
async def ListFirewallRules(self):
"""ListFirewallRules returns all the firewall rules.

Returns -> ListFirewallRulesResults
"""
# map input types to rpc msg
_params = dict()
msg = dict(
type="FirewallRules", request="ListFirewallRules", version=1, params=_params
)

reply = await self.rpc(msg)
return reply

@ReturnMapping(ErrorResults)
async def SetFirewallRules(self, args=None):
"""SetFirewallRules creates or updates the specified firewall rules.

args : typing.Sequence[~FirewallRule]
Returns -> ErrorResults
"""
if args is not None and not isinstance(args, (bytes, str, list)):
raise Exception(f"Expected args to be a Sequence, received: {type(args)}")

# map input types to rpc msg
_params = dict()
msg = dict(
type="FirewallRules", request="SetFirewallRules", version=1, params=_params
)
_params["args"] = args
reply = await self.rpc(msg)
return reply


class ImageMetadataManagerFacade(Type):
name = "ImageMetadataManager"
version = 1
Expand Down Expand Up @@ -517,34 +478,3 @@ async def UpdateSecretBackends(self, args=None):
_params["args"] = args
reply = await self.rpc(msg)
return reply


class SecretsFacade(Type):
name = "Secrets"
version = 1

@ReturnMapping(ListSecretResults)
async def ListSecrets(self, filter_=None, show_secrets=None):
"""ListSecrets lists available secrets.

filter_ : SecretsFilter
show_secrets : bool
Returns -> ListSecretResults
"""
if filter_ is not None and not isinstance(filter_, (dict, SecretsFilter)):
raise Exception(
f"Expected filter_ to be a SecretsFilter, received: {type(filter_)}"
)

if show_secrets is not None and not isinstance(show_secrets, bool):
raise Exception(
f"Expected show_secrets to be a bool, received: {type(show_secrets)}"
)

# map input types to rpc msg
_params = dict()
msg = dict(type="Secrets", request="ListSecrets", version=1, params=_params)
_params["filter"] = filter_
_params["show-secrets"] = show_secrets
reply = await self.rpc(msg)
return reply
Loading