Skip to content

Cli interface not properly using scheme and api-port arguments #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gCarlNoiseux wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cli interface not properly using scheme and api-port arguments #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c25186
Instanciation of Consul instance in cli.py file uses positional argum…
gCarlNoiseux Sep 1, 2021
644ba0e
consulate.models.base: fix Iterable path
leansy Nov 24, 2021
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
10 changes: 8 additions & 2 deletions consulate/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,14 @@ def main():
if args.api_host:
api_host = args.api_host

consul = consulate.Consul(api_host, port, args.dc,
args.token, args.api_scheme, adapter)
consul = consulate.Consul(
host=api_host,
port=port,
datacenter=args.dc,
token=args.token,
scheme=args.api_scheme,
adapter=adapter,
)

if args.command == 'acl':
ACL_ACTIONS[args.action](consul, args)
Expand Down
2 changes: 1 addition & 1 deletion consulate/models/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import collections


class Model(collections.Iterable):
class Model(collections.abc.Iterable):
"""A model contains an __attribute__ map that defines the name,
its type for type validation, an optional validation method, a method
used to
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import setuptools

setuptools.setup(
name='abaez.consulate',
version='1.1.0',
name='consulate',
version='1.1.2',
description='A Client library and command line application for the Consul',
maintainer='Gavin M. Roy',
maintainer_email='gavinr@aweber.com',
Expand Down