HH-137449 add 'caller' as a param for request Consul#9

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

Merged
nicholasgribanov merged 2 commits into from
Sep 29, 2021
Merged

HH-137449 add 'caller' as a param for request Consul #9

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
ecba430
HH-137449 add 'caller' as a param for request Consul
nicholasgribanov Sep 29, 2021
c7128e2
Bump version: 0.2.5 → 0.2.6
nicholasgribanov Sep 29, 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
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = True
current_version = 0.2.5
current_version = 0.2.6
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
serialize =
{major}.{minor}.{patch}-{release}
Expand Down
2 changes: 1 addition & 1 deletion consul/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = '0.2.5'
__version__ = '0.2.6'

from consul.base import ACLDisabled # noqa
from consul.base import ACLPermissionDenied # noqa
Expand Down
53 changes: 41 additions & 12 deletions consul/base.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -350,9 +350,10 @@ class ConsulCacheBase(metaclass=abc.ABCMeta):
calls to wait for changes since this query was last run.
"""

def __init__(self, watch_seconds: str, backoff_delay_seconds: int):
def __init__(self, watch_seconds: str, backoff_delay_seconds: int, caller: str):
self.cache = dict()
self.callbacks = []
self.caller = caller
self.watch_seconds = watch_seconds
self.backoff_delay_seconds = backoff_delay_seconds
self.index = None
Expand DownExpand Up@@ -397,8 +398,9 @@ def __init__(self,
backoff_delay_seconds: int,
service: str,
passing: bool,
dc: str):
super().__init__(watch_seconds, backoff_delay_seconds)
dc: str,
caller: str):
super().__init__(watch_seconds, backoff_delay_seconds, caller)
self.service = service
self.health_client = health_client
self.passing = passing
Expand All@@ -407,6 +409,7 @@ def __init__(self,
service=self.service,
passing=self.passing,
dc=self.dc,
caller=self.caller
)
self.cache = {self.service: service_health}

Expand All@@ -418,7 +421,8 @@ def _update_cache(self):
'passing': self.passing,
'index': self.index,
'wait': self.watch_seconds,
'dc': self.dc
'dc': self.dc,
'caller': self.caller
}
log.debug(f'Param for health query: {params}')
self.index, values = self.health_client.service(**params)
Expand DownExpand Up@@ -459,8 +463,9 @@ def __init__(self,
total_timeout: int,
recurse: bool,
consistency_mode: ConsistencyMode,
caller: str,
cache_initial_warmup_timeout=None):
super().__init__(watch_seconds, backoff_delay_seconds)
super().__init__(watch_seconds, backoff_delay_seconds, caller)
self.kv_client = kv_client
self.path = path
self.recurse = recurse
Expand All@@ -470,7 +475,8 @@ def __init__(self,
self.index, kv = kv_client.get(
key=path,
recurse=recurse,
total_timeout=self._get_warmup_timeout()
total_timeout=self._get_warmup_timeout(),
caller=self.caller
)
self.cache = {self.path: kv}

Expand All@@ -491,7 +497,8 @@ def _update_cache(self):
'wait': self.watch_seconds,
'total_timeout': self.total_timeout,
'consistency': self.consistency_mode,
'recurse': self.recurse
'recurse': self.recurse,
'caller': self.caller
}
log.debug(f'Param for kv query: {params}')
self.index, values = self.kv_client.get(**params)
Expand DownExpand Up@@ -1596,6 +1603,7 @@ def register(
ttl=None,
http=None,
timeout=None,
caller=None,
enable_tag_override=False):
"""
Add a new service to the local agent. There is more
Expand DownExpand Up@@ -1629,6 +1637,8 @@ def register(
*script*, *interval*, *ttl*, *http*, and *timeout* arguments
are deprecated. use *check* instead.

*caller* is a name of caller service.

*enable_tag_override* is an optional bool that enable you
to modify a service tags from servers(consul agent role server)
Default is set to False.
Expand All@@ -1637,7 +1647,7 @@ def register(
for more information
https://www.consul.io/docs/agent/services.html
"""

params = []
payload = {}

payload['name'] = name
Expand All@@ -1658,6 +1668,9 @@ def register(
if weights:
payload['weights'] = weights

if caller:
params.append(('caller', caller))

else:
payload.update(Check._compat(
script=script,
Expand All@@ -1675,22 +1688,28 @@ def register(
CB.bool(),
path='/v1/agent/service/register',
headers=headers,
params=params,
data=json.dumps(payload))

def deregister(self, service_id, token=None):
def deregister(self, service_id, caller=None, token=None):
"""
Used to remove a service from the local agent. The agent will
take care of deregistering the service with the Catalog. If
there is an associated check, that is also deregistered.
"""

params = []
headers = {}
token = token or self.agent.token
if token:
headers['X-Consul-Token'] = token
if caller:
params.append(('caller', caller))
return self.agent.http.put(
CB.bool(),
path='/v1/agent/service/deregister/%s' % service_id,
headers=headers
headers=headers,
params=params
)

def maintenance(self, service_id, enable, reason=None, token=None):
Expand DownExpand Up@@ -2935,7 +2954,8 @@ def service(self,
dc=None,
near=None,
token=None,
node_meta=None):
node_meta=None,
caller=None):
"""
Returns a tuple of (*index*, *nodes*)

Expand DownExpand Up@@ -2963,6 +2983,8 @@ def service(self,

*node_meta* is an optional meta data used for filtering, a
dictionary formatted as {k1:v1, k2:v2}.

*caller* is a name of caller service.
"""
params = []
headers = {}
Expand All@@ -2987,6 +3009,8 @@ def service(self,
for nodemeta_name, nodemeta_value in node_meta.items():
params.append(('node-meta', '{0}:{1}'.
format(nodemeta_name, nodemeta_value)))
if caller:
params.append(('caller', caller))
return self.agent.http.get(
CB.json(index=True),
path='/v1/health/service/%s' % service,
Expand DownExpand Up@@ -3167,7 +3191,8 @@ def get(
keys=False,
separator=None,
dc=None,
total_timeout=None):
total_timeout=None,
caller=None):
"""
Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3203,6 +3228,8 @@ def get(
"Session": "adf4238a-882b-9ddc-4a9d-5b6758e4159e"
}

*caller* is a name of caller service.

Note, if the requested key does not exists *(index, None)* is
returned. It's then possible to long poll on the index for when the
key is created.
Expand DownExpand Up@@ -3234,6 +3261,8 @@ def get(
consistency = consistency or self.agent.consistency
if consistency in ('consistent', 'stale'):
params.append((consistency, '1'))
if caller:
params.append(('caller', caller))

one = False
decode = False
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
# Required metadata
sonar.projectKey=com.github:poppyred:python-consul2
sonar.projectName=Python Consul2 HH
sonar.projectVersion=0.2.5
sonar.projectVersion=0.2.6

# Comma-separated paths to directories with sources (required)
sonar.sources=consul
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
HH-137449 add 'caller' as a param for request Consul#9

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

 Merged

nicholasgribanov
merged 2 commits into

from

Sep 29, 2021
 Merged


HH-137449 add 'caller' as a param for request Consul
#9
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
ecba430

HH-137449 add 'caller' as a param for request Consul


nicholasgribanov Sep 29, 2021
c7128e2

Bump version: 0.2.5 → 0.2.6


nicholasgribanov Sep 29, 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


2 changes: 1 addition & 1 deletion
.bumpversion.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = True
current_version = 0.2.5
current_version = 0.2.6
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
serialize = 
	{major}.{minor}.{patch}-{release}
Expand Down

2 changes: 1 addition & 1 deletion
consul/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = '0.2.5'
__version__ = '0.2.6'

from consul.base import ACLDisabled # noqa
from consul.base import ACLPermissionDenied # noqa
Expand Down

53 changes: 41 additions & 12 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,9 +350,10 @@ class ConsulCacheBase(metaclass=abc.ABCMeta):
 calls to wait for changes since this query was last run.
 """

 def __init__(self, watch_seconds: str, backoff_delay_seconds: int):
 def __init__(self, watch_seconds: str, backoff_delay_seconds: int, caller: str):
 self.cache = dict()
 self.callbacks = []
 self.caller = caller
 self.watch_seconds = watch_seconds
 self.backoff_delay_seconds = backoff_delay_seconds
 self.index = None
Expand DownExpand Up@@ -397,8 +398,9 @@ def __init__(self,
 backoff_delay_seconds: int,
 service: str,
 passing: bool,
 dc: str):
 super().__init__(watch_seconds, backoff_delay_seconds)
 dc: str,
 caller: str):
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.service = service
 self.health_client = health_client
 self.passing = passing
Expand All@@ -407,6 +409,7 @@ def __init__(self,
 service=self.service,
 passing=self.passing,
 dc=self.dc,
 caller=self.caller
 )
 self.cache = {self.service: service_health}

Expand All@@ -418,7 +421,8 @@ def _update_cache(self):
 'passing': self.passing,
 'index': self.index,
 'wait': self.watch_seconds,
 'dc': self.dc
 'dc': self.dc,
 'caller': self.caller
 }
 log.debug(f'Param for health query: {params}')
 self.index, values = self.health_client.service(**params)
Expand DownExpand Up@@ -459,8 +463,9 @@ def __init__(self,
 total_timeout: int,
 recurse: bool,
 consistency_mode: ConsistencyMode,
 caller: str,
 cache_initial_warmup_timeout=None):
 super().__init__(watch_seconds, backoff_delay_seconds)
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.kv_client = kv_client
 self.path = path
 self.recurse = recurse
Expand All@@ -470,7 +475,8 @@ def __init__(self,
 self.index, kv = kv_client.get(
 key=path,
 recurse=recurse,
 total_timeout=self._get_warmup_timeout()
 total_timeout=self._get_warmup_timeout(),
 caller=self.caller
 )
 self.cache = {self.path: kv}

Expand All@@ -491,7 +497,8 @@ def _update_cache(self):
 'wait': self.watch_seconds,
 'total_timeout': self.total_timeout,
 'consistency': self.consistency_mode,
 'recurse': self.recurse
 'recurse': self.recurse,
 'caller': self.caller
 }
 log.debug(f'Param for kv query: {params}')
 self.index, values = self.kv_client.get(**params)
Expand DownExpand Up@@ -1596,6 +1603,7 @@ def register(
 ttl=None,
 http=None,
 timeout=None,
 caller=None,
 enable_tag_override=False):
 """
 Add a new service to the local agent. There is more
Expand DownExpand Up@@ -1629,6 +1637,8 @@ def register(
 *script*, *interval*, *ttl*, *http*, and *timeout* arguments
 are deprecated. use *check* instead.

 *caller* is a name of caller service.

 *enable_tag_override* is an optional bool that enable you
 to modify a service tags from servers(consul agent role server)
 Default is set to False.
Expand All@@ -1637,7 +1647,7 @@ def register(
 for more information
 https://www.consul.io/docs/agent/services.html
 """

 params = []
 payload = {}

 payload['name'] = name
Expand All@@ -1658,6 +1668,9 @@ def register(
 if weights:
 payload['weights'] = weights

 if caller:
 params.append(('caller', caller))

 else:
 payload.update(Check._compat(
 script=script,
Expand All@@ -1675,22 +1688,28 @@ def register(
 CB.bool(),
 path='/v1/agent/service/register',
 headers=headers,
 params=params,
 data=json.dumps(payload))

 def deregister(self, service_id, token=None):
 def deregister(self, service_id, caller=None, token=None):
 """
 Used to remove a service from the local agent. The agent will
 take care of deregistering the service with the Catalog. If
 there is an associated check, that is also deregistered.
 """

 params = []
 headers = {}
 token = token or self.agent.token
 if token:
 headers['X-Consul-Token'] = token
 if caller:
 params.append(('caller', caller))
 return self.agent.http.put(
 CB.bool(),
 path='/v1/agent/service/deregister/%s' % service_id,
 headers=headers
 headers=headers,
 params=params
 )

 def maintenance(self, service_id, enable, reason=None, token=None):
Expand DownExpand Up@@ -2935,7 +2954,8 @@ def service(self,
 dc=None,
 near=None,
 token=None,
 node_meta=None):
 node_meta=None,
 caller=None):
 """
 Returns a tuple of (*index*, *nodes*)

Expand DownExpand Up@@ -2963,6 +2983,8 @@ def service(self,

 *node_meta* is an optional meta data used for filtering, a
 dictionary formatted as {k1:v1, k2:v2}.

 *caller* is a name of caller service.
 """
 params = []
 headers = {}
Expand All@@ -2987,6 +3009,8 @@ def service(self,
 for nodemeta_name, nodemeta_value in node_meta.items():
 params.append(('node-meta', '{0}:{1}'.
 format(nodemeta_name, nodemeta_value)))
 if caller:
 params.append(('caller', caller))
 return self.agent.http.get(
 CB.json(index=True),
 path='/v1/health/service/%s' % service,
Expand DownExpand Up@@ -3167,7 +3191,8 @@ def get(
 keys=False,
 separator=None,
 dc=None,
 total_timeout=None):
 total_timeout=None,
 caller=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3203,6 +3228,8 @@ def get(
 "Session": "adf4238a-882b-9ddc-4a9d-5b6758e4159e"
 }

 *caller* is a name of caller service.

 Note, if the requested key does not exists *(index, None)* is
 returned. It's then possible to long poll on the index for when the
 key is created.
Expand DownExpand Up@@ -3234,6 +3261,8 @@ def get(
 consistency = consistency or self.agent.consistency
 if consistency in ('consistent', 'stale'):
 params.append((consistency, '1'))
 if caller:
 params.append(('caller', caller))

 one = False
 decode = False
Expand Down

2 changes: 1 addition & 1 deletion
sonar-project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
# Required metadata
sonar.projectKey=com.github:poppyred:python-consul2
sonar.projectName=Python Consul2 HH
sonar.projectVersion=0.2.5
sonar.projectVersion=0.2.6

# Comma-separated paths to directories with sources (required)
sonar.sources=consul
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
HH-137449 add 'caller' as a param for request Consul#9

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

 Merged

nicholasgribanov
merged 2 commits into

from

Sep 29, 2021
 Merged


HH-137449 add 'caller' as a param for request Consul
#9
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
ecba430

HH-137449 add 'caller' as a param for request Consul


nicholasgribanov Sep 29, 2021
c7128e2

Bump version: 0.2.5 → 0.2.6


nicholasgribanov Sep 29, 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


2 changes: 1 addition & 1 deletion
.bumpversion.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = True
current_version = 0.2.5
current_version = 0.2.6
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
serialize = 
	{major}.{minor}.{patch}-{release}
Expand Down

2 changes: 1 addition & 1 deletion
consul/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = '0.2.5'
__version__ = '0.2.6'

from consul.base import ACLDisabled # noqa
from consul.base import ACLPermissionDenied # noqa
Expand Down

53 changes: 41 additions & 12 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,9 +350,10 @@ class ConsulCacheBase(metaclass=abc.ABCMeta):
 calls to wait for changes since this query was last run.
 """

 def __init__(self, watch_seconds: str, backoff_delay_seconds: int):
 def __init__(self, watch_seconds: str, backoff_delay_seconds: int, caller: str):
 self.cache = dict()
 self.callbacks = []
 self.caller = caller
 self.watch_seconds = watch_seconds
 self.backoff_delay_seconds = backoff_delay_seconds
 self.index = None
Expand DownExpand Up@@ -397,8 +398,9 @@ def __init__(self,
 backoff_delay_seconds: int,
 service: str,
 passing: bool,
 dc: str):
 super().__init__(watch_seconds, backoff_delay_seconds)
 dc: str,
 caller: str):
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.service = service
 self.health_client = health_client
 self.passing = passing
Expand All@@ -407,6 +409,7 @@ def __init__(self,
 service=self.service,
 passing=self.passing,
 dc=self.dc,
 caller=self.caller
 )
 self.cache = {self.service: service_health}

Expand All@@ -418,7 +421,8 @@ def _update_cache(self):
 'passing': self.passing,
 'index': self.index,
 'wait': self.watch_seconds,
 'dc': self.dc
 'dc': self.dc,
 'caller': self.caller
 }
 log.debug(f'Param for health query: {params}')
 self.index, values = self.health_client.service(**params)
Expand DownExpand Up@@ -459,8 +463,9 @@ def __init__(self,
 total_timeout: int,
 recurse: bool,
 consistency_mode: ConsistencyMode,
 caller: str,
 cache_initial_warmup_timeout=None):
 super().__init__(watch_seconds, backoff_delay_seconds)
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.kv_client = kv_client
 self.path = path
 self.recurse = recurse
Expand All@@ -470,7 +475,8 @@ def __init__(self,
 self.index, kv = kv_client.get(
 key=path,
 recurse=recurse,
 total_timeout=self._get_warmup_timeout()
 total_timeout=self._get_warmup_timeout(),
 caller=self.caller
 )
 self.cache = {self.path: kv}

Expand All@@ -491,7 +497,8 @@ def _update_cache(self):
 'wait': self.watch_seconds,
 'total_timeout': self.total_timeout,
 'consistency': self.consistency_mode,
 'recurse': self.recurse
 'recurse': self.recurse,
 'caller': self.caller
 }
 log.debug(f'Param for kv query: {params}')
 self.index, values = self.kv_client.get(**params)
Expand DownExpand Up@@ -1596,6 +1603,7 @@ def register(
 ttl=None,
 http=None,
 timeout=None,
 caller=None,
 enable_tag_override=False):
 """
 Add a new service to the local agent. There is more
Expand DownExpand Up@@ -1629,6 +1637,8 @@ def register(
 *script*, *interval*, *ttl*, *http*, and *timeout* arguments
 are deprecated. use *check* instead.

 *caller* is a name of caller service.

 *enable_tag_override* is an optional bool that enable you
 to modify a service tags from servers(consul agent role server)
 Default is set to False.
Expand All@@ -1637,7 +1647,7 @@ def register(
 for more information
 https://www.consul.io/docs/agent/services.html
 """

 params = []
 payload = {}

 payload['name'] = name
Expand All@@ -1658,6 +1668,9 @@ def register(
 if weights:
 payload['weights'] = weights

 if caller:
 params.append(('caller', caller))

 else:
 payload.update(Check._compat(
 script=script,
Expand All@@ -1675,22 +1688,28 @@ def register(
 CB.bool(),
 path='/v1/agent/service/register',
 headers=headers,
 params=params,
 data=json.dumps(payload))

 def deregister(self, service_id, token=None):
 def deregister(self, service_id, caller=None, token=None):
 """
 Used to remove a service from the local agent. The agent will
 take care of deregistering the service with the Catalog. If
 there is an associated check, that is also deregistered.
 """

 params = []
 headers = {}
 token = token or self.agent.token
 if token:
 headers['X-Consul-Token'] = token
 if caller:
 params.append(('caller', caller))
 return self.agent.http.put(
 CB.bool(),
 path='/v1/agent/service/deregister/%s' % service_id,
 headers=headers
 headers=headers,
 params=params
 )

 def maintenance(self, service_id, enable, reason=None, token=None):
Expand DownExpand Up@@ -2935,7 +2954,8 @@ def service(self,
 dc=None,
 near=None,
 token=None,
 node_meta=None):
 node_meta=None,
 caller=None):
 """
 Returns a tuple of (*index*, *nodes*)

Expand DownExpand Up@@ -2963,6 +2983,8 @@ def service(self,

 *node_meta* is an optional meta data used for filtering, a
 dictionary formatted as {k1:v1, k2:v2}.

 *caller* is a name of caller service.
 """
 params = []
 headers = {}
Expand All@@ -2987,6 +3009,8 @@ def service(self,
 for nodemeta_name, nodemeta_value in node_meta.items():
 params.append(('node-meta', '{0}:{1}'.
 format(nodemeta_name, nodemeta_value)))
 if caller:
 params.append(('caller', caller))
 return self.agent.http.get(
 CB.json(index=True),
 path='/v1/health/service/%s' % service,
Expand DownExpand Up@@ -3167,7 +3191,8 @@ def get(
 keys=False,
 separator=None,
 dc=None,
 total_timeout=None):
 total_timeout=None,
 caller=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3203,6 +3228,8 @@ def get(
 "Session": "adf4238a-882b-9ddc-4a9d-5b6758e4159e"
 }

 *caller* is a name of caller service.

 Note, if the requested key does not exists *(index, None)* is
 returned. It's then possible to long poll on the index for when the
 key is created.
Expand DownExpand Up@@ -3234,6 +3261,8 @@ def get(
 consistency = consistency or self.agent.consistency
 if consistency in ('consistent', 'stale'):
 params.append((consistency, '1'))
 if caller:
 params.append(('caller', caller))

 one = False
 decode = False
Expand Down

2 changes: 1 addition & 1 deletion
sonar-project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
# Required metadata
sonar.projectKey=com.github:poppyred:python-consul2
sonar.projectName=Python Consul2 HH
sonar.projectVersion=0.2.5
sonar.projectVersion=0.2.6

# Comma-separated paths to directories with sources (required)
sonar.sources=consul
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
HH-137449 add 'caller' as a param for request Consul#9

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

 Merged

nicholasgribanov
merged 2 commits into

from

Sep 29, 2021
 Merged


HH-137449 add 'caller' as a param for request Consul
#9
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
ecba430

HH-137449 add 'caller' as a param for request Consul


nicholasgribanov Sep 29, 2021
c7128e2

Bump version: 0.2.5 → 0.2.6


nicholasgribanov Sep 29, 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


2 changes: 1 addition & 1 deletion
.bumpversion.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = True
current_version = 0.2.5
current_version = 0.2.6
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
serialize = 
	{major}.{minor}.{patch}-{release}
Expand Down

2 changes: 1 addition & 1 deletion
consul/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = '0.2.5'
__version__ = '0.2.6'

from consul.base import ACLDisabled # noqa
from consul.base import ACLPermissionDenied # noqa
Expand Down

53 changes: 41 additions & 12 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,9 +350,10 @@ class ConsulCacheBase(metaclass=abc.ABCMeta):
 calls to wait for changes since this query was last run.
 """

 def __init__(self, watch_seconds: str, backoff_delay_seconds: int):
 def __init__(self, watch_seconds: str, backoff_delay_seconds: int, caller: str):
 self.cache = dict()
 self.callbacks = []
 self.caller = caller
 self.watch_seconds = watch_seconds
 self.backoff_delay_seconds = backoff_delay_seconds
 self.index = None
Expand DownExpand Up@@ -397,8 +398,9 @@ def __init__(self,
 backoff_delay_seconds: int,
 service: str,
 passing: bool,
 dc: str):
 super().__init__(watch_seconds, backoff_delay_seconds)
 dc: str,
 caller: str):
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.service = service
 self.health_client = health_client
 self.passing = passing
Expand All@@ -407,6 +409,7 @@ def __init__(self,
 service=self.service,
 passing=self.passing,
 dc=self.dc,
 caller=self.caller
 )
 self.cache = {self.service: service_health}

Expand All@@ -418,7 +421,8 @@ def _update_cache(self):
 'passing': self.passing,
 'index': self.index,
 'wait': self.watch_seconds,
 'dc': self.dc
 'dc': self.dc,
 'caller': self.caller
 }
 log.debug(f'Param for health query: {params}')
 self.index, values = self.health_client.service(**params)
Expand DownExpand Up@@ -459,8 +463,9 @@ def __init__(self,
 total_timeout: int,
 recurse: bool,
 consistency_mode: ConsistencyMode,
 caller: str,
 cache_initial_warmup_timeout=None):
 super().__init__(watch_seconds, backoff_delay_seconds)
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.kv_client = kv_client
 self.path = path
 self.recurse = recurse
Expand All@@ -470,7 +475,8 @@ def __init__(self,
 self.index, kv = kv_client.get(
 key=path,
 recurse=recurse,
 total_timeout=self._get_warmup_timeout()
 total_timeout=self._get_warmup_timeout(),
 caller=self.caller
 )
 self.cache = {self.path: kv}

Expand All@@ -491,7 +497,8 @@ def _update_cache(self):
 'wait': self.watch_seconds,
 'total_timeout': self.total_timeout,
 'consistency': self.consistency_mode,
 'recurse': self.recurse
 'recurse': self.recurse,
 'caller': self.caller
 }
 log.debug(f'Param for kv query: {params}')
 self.index, values = self.kv_client.get(**params)
Expand DownExpand Up@@ -1596,6 +1603,7 @@ def register(
 ttl=None,
 http=None,
 timeout=None,
 caller=None,
 enable_tag_override=False):
 """
 Add a new service to the local agent. There is more
Expand DownExpand Up@@ -1629,6 +1637,8 @@ def register(
 *script*, *interval*, *ttl*, *http*, and *timeout* arguments
 are deprecated. use *check* instead.

 *caller* is a name of caller service.

 *enable_tag_override* is an optional bool that enable you
 to modify a service tags from servers(consul agent role server)
 Default is set to False.
Expand All@@ -1637,7 +1647,7 @@ def register(
 for more information
 https://www.consul.io/docs/agent/services.html
 """

 params = []
 payload = {}

 payload['name'] = name
Expand All@@ -1658,6 +1668,9 @@ def register(
 if weights:
 payload['weights'] = weights

 if caller:
 params.append(('caller', caller))

 else:
 payload.update(Check._compat(
 script=script,
Expand All@@ -1675,22 +1688,28 @@ def register(
 CB.bool(),
 path='/v1/agent/service/register',
 headers=headers,
 params=params,
 data=json.dumps(payload))

 def deregister(self, service_id, token=None):
 def deregister(self, service_id, caller=None, token=None):
 """
 Used to remove a service from the local agent. The agent will
 take care of deregistering the service with the Catalog. If
 there is an associated check, that is also deregistered.
 """

 params = []
 headers = {}
 token = token or self.agent.token
 if token:
 headers['X-Consul-Token'] = token
 if caller:
 params.append(('caller', caller))
 return self.agent.http.put(
 CB.bool(),
 path='/v1/agent/service/deregister/%s' % service_id,
 headers=headers
 headers=headers,
 params=params
 )

 def maintenance(self, service_id, enable, reason=None, token=None):
Expand DownExpand Up@@ -2935,7 +2954,8 @@ def service(self,
 dc=None,
 near=None,
 token=None,
 node_meta=None):
 node_meta=None,
 caller=None):
 """
 Returns a tuple of (*index*, *nodes*)

Expand DownExpand Up@@ -2963,6 +2983,8 @@ def service(self,

 *node_meta* is an optional meta data used for filtering, a
 dictionary formatted as {k1:v1, k2:v2}.

 *caller* is a name of caller service.
 """
 params = []
 headers = {}
Expand All@@ -2987,6 +3009,8 @@ def service(self,
 for nodemeta_name, nodemeta_value in node_meta.items():
 params.append(('node-meta', '{0}:{1}'.
 format(nodemeta_name, nodemeta_value)))
 if caller:
 params.append(('caller', caller))
 return self.agent.http.get(
 CB.json(index=True),
 path='/v1/health/service/%s' % service,
Expand DownExpand Up@@ -3167,7 +3191,8 @@ def get(
 keys=False,
 separator=None,
 dc=None,
 total_timeout=None):
 total_timeout=None,
 caller=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3203,6 +3228,8 @@ def get(
 "Session": "adf4238a-882b-9ddc-4a9d-5b6758e4159e"
 }

 *caller* is a name of caller service.

 Note, if the requested key does not exists *(index, None)* is
 returned. It's then possible to long poll on the index for when the
 key is created.
Expand DownExpand Up@@ -3234,6 +3261,8 @@ def get(
 consistency = consistency or self.agent.consistency
 if consistency in ('consistent', 'stale'):
 params.append((consistency, '1'))
 if caller:
 params.append(('caller', caller))

 one = False
 decode = False
Expand Down

2 changes: 1 addition & 1 deletion
sonar-project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
# Required metadata
sonar.projectKey=com.github:poppyred:python-consul2
sonar.projectName=Python Consul2 HH
sonar.projectVersion=0.2.5
sonar.projectVersion=0.2.6

# Comma-separated paths to directories with sources (required)
sonar.sources=consul
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
HH-137449 add 'caller' as a param for request Consul#9

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

 Merged

nicholasgribanov
merged 2 commits into

from

Sep 29, 2021
 Merged


HH-137449 add 'caller' as a param for request Consul
#9
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
ecba430

HH-137449 add 'caller' as a param for request Consul


nicholasgribanov Sep 29, 2021
c7128e2

Bump version: 0.2.5 → 0.2.6


nicholasgribanov Sep 29, 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


2 changes: 1 addition & 1 deletion
.bumpversion.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = True
current_version = 0.2.5
current_version = 0.2.6
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
serialize = 
	{major}.{minor}.{patch}-{release}
Expand Down

2 changes: 1 addition & 1 deletion
consul/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = '0.2.5'
__version__ = '0.2.6'

from consul.base import ACLDisabled # noqa
from consul.base import ACLPermissionDenied # noqa
Expand Down

53 changes: 41 additions & 12 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,9 +350,10 @@ class ConsulCacheBase(metaclass=abc.ABCMeta):
 calls to wait for changes since this query was last run.
 """

 def __init__(self, watch_seconds: str, backoff_delay_seconds: int):
 def __init__(self, watch_seconds: str, backoff_delay_seconds: int, caller: str):
 self.cache = dict()
 self.callbacks = []
 self.caller = caller
 self.watch_seconds = watch_seconds
 self.backoff_delay_seconds = backoff_delay_seconds
 self.index = None
Expand DownExpand Up@@ -397,8 +398,9 @@ def __init__(self,
 backoff_delay_seconds: int,
 service: str,
 passing: bool,
 dc: str):
 super().__init__(watch_seconds, backoff_delay_seconds)
 dc: str,
 caller: str):
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.service = service
 self.health_client = health_client
 self.passing = passing
Expand All@@ -407,6 +409,7 @@ def __init__(self,
 service=self.service,
 passing=self.passing,
 dc=self.dc,
 caller=self.caller
 )
 self.cache = {self.service: service_health}

Expand All@@ -418,7 +421,8 @@ def _update_cache(self):
 'passing': self.passing,
 'index': self.index,
 'wait': self.watch_seconds,
 'dc': self.dc
 'dc': self.dc,
 'caller': self.caller
 }
 log.debug(f'Param for health query: {params}')
 self.index, values = self.health_client.service(**params)
Expand DownExpand Up@@ -459,8 +463,9 @@ def __init__(self,
 total_timeout: int,
 recurse: bool,
 consistency_mode: ConsistencyMode,
 caller: str,
 cache_initial_warmup_timeout=None):
 super().__init__(watch_seconds, backoff_delay_seconds)
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.kv_client = kv_client
 self.path = path
 self.recurse = recurse
Expand All@@ -470,7 +475,8 @@ def __init__(self,
 self.index, kv = kv_client.get(
 key=path,
 recurse=recurse,
 total_timeout=self._get_warmup_timeout()
 total_timeout=self._get_warmup_timeout(),
 caller=self.caller
 )
 self.cache = {self.path: kv}

Expand All@@ -491,7 +497,8 @@ def _update_cache(self):
 'wait': self.watch_seconds,
 'total_timeout': self.total_timeout,
 'consistency': self.consistency_mode,
 'recurse': self.recurse
 'recurse': self.recurse,
 'caller': self.caller
 }
 log.debug(f'Param for kv query: {params}')
 self.index, values = self.kv_client.get(**params)
Expand DownExpand Up@@ -1596,6 +1603,7 @@ def register(
 ttl=None,
 http=None,
 timeout=None,
 caller=None,
 enable_tag_override=False):
 """
 Add a new service to the local agent. There is more
Expand DownExpand Up@@ -1629,6 +1637,8 @@ def register(
 *script*, *interval*, *ttl*, *http*, and *timeout* arguments
 are deprecated. use *check* instead.

 *caller* is a name of caller service.

 *enable_tag_override* is an optional bool that enable you
 to modify a service tags from servers(consul agent role server)
 Default is set to False.
Expand All@@ -1637,7 +1647,7 @@ def register(
 for more information
 https://www.consul.io/docs/agent/services.html
 """

 params = []
 payload = {}

 payload['name'] = name
Expand All@@ -1658,6 +1668,9 @@ def register(
 if weights:
 payload['weights'] = weights

 if caller:
 params.append(('caller', caller))

 else:
 payload.update(Check._compat(
 script=script,
Expand All@@ -1675,22 +1688,28 @@ def register(
 CB.bool(),
 path='/v1/agent/service/register',
 headers=headers,
 params=params,
 data=json.dumps(payload))

 def deregister(self, service_id, token=None):
 def deregister(self, service_id, caller=None, token=None):
 """
 Used to remove a service from the local agent. The agent will
 take care of deregistering the service with the Catalog. If
 there is an associated check, that is also deregistered.
 """

 params = []
 headers = {}
 token = token or self.agent.token
 if token:
 headers['X-Consul-Token'] = token
 if caller:
 params.append(('caller', caller))
 return self.agent.http.put(
 CB.bool(),
 path='/v1/agent/service/deregister/%s' % service_id,
 headers=headers
 headers=headers,
 params=params
 )

 def maintenance(self, service_id, enable, reason=None, token=None):
Expand DownExpand Up@@ -2935,7 +2954,8 @@ def service(self,
 dc=None,
 near=None,
 token=None,
 node_meta=None):
 node_meta=None,
 caller=None):
 """
 Returns a tuple of (*index*, *nodes*)

Expand DownExpand Up@@ -2963,6 +2983,8 @@ def service(self,

 *node_meta* is an optional meta data used for filtering, a
 dictionary formatted as {k1:v1, k2:v2}.

 *caller* is a name of caller service.
 """
 params = []
 headers = {}
Expand All@@ -2987,6 +3009,8 @@ def service(self,
 for nodemeta_name, nodemeta_value in node_meta.items():
 params.append(('node-meta', '{0}:{1}'.
 format(nodemeta_name, nodemeta_value)))
 if caller:
 params.append(('caller', caller))
 return self.agent.http.get(
 CB.json(index=True),
 path='/v1/health/service/%s' % service,
Expand DownExpand Up@@ -3167,7 +3191,8 @@ def get(
 keys=False,
 separator=None,
 dc=None,
 total_timeout=None):
 total_timeout=None,
 caller=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3203,6 +3228,8 @@ def get(
 "Session": "adf4238a-882b-9ddc-4a9d-5b6758e4159e"
 }

 *caller* is a name of caller service.

 Note, if the requested key does not exists *(index, None)* is
 returned. It's then possible to long poll on the index for when the
 key is created.
Expand DownExpand Up@@ -3234,6 +3261,8 @@ def get(
 consistency = consistency or self.agent.consistency
 if consistency in ('consistent', 'stale'):
 params.append((consistency, '1'))
 if caller:
 params.append(('caller', caller))

 one = False
 decode = False
Expand Down

2 changes: 1 addition & 1 deletion
sonar-project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
# Required metadata
sonar.projectKey=com.github:poppyred:python-consul2
sonar.projectName=Python Consul2 HH
sonar.projectVersion=0.2.5
sonar.projectVersion=0.2.6

# Comma-separated paths to directories with sources (required)
sonar.sources=consul
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
HH-137449 add 'caller' as a param for request Consul#9

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

 Merged

nicholasgribanov
merged 2 commits into

from

Sep 29, 2021
 Merged


HH-137449 add 'caller' as a param for request Consul
#9
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
ecba430

HH-137449 add 'caller' as a param for request Consul


nicholasgribanov Sep 29, 2021
c7128e2

Bump version: 0.2.5 → 0.2.6


nicholasgribanov Sep 29, 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


2 changes: 1 addition & 1 deletion
.bumpversion.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = True
current_version = 0.2.5
current_version = 0.2.6
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
serialize = 
	{major}.{minor}.{patch}-{release}
Expand Down

2 changes: 1 addition & 1 deletion
consul/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = '0.2.5'
__version__ = '0.2.6'

from consul.base import ACLDisabled # noqa
from consul.base import ACLPermissionDenied # noqa
Expand Down

53 changes: 41 additions & 12 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,9 +350,10 @@ class ConsulCacheBase(metaclass=abc.ABCMeta):
 calls to wait for changes since this query was last run.
 """

 def __init__(self, watch_seconds: str, backoff_delay_seconds: int):
 def __init__(self, watch_seconds: str, backoff_delay_seconds: int, caller: str):
 self.cache = dict()
 self.callbacks = []
 self.caller = caller
 self.watch_seconds = watch_seconds
 self.backoff_delay_seconds = backoff_delay_seconds
 self.index = None
Expand DownExpand Up@@ -397,8 +398,9 @@ def __init__(self,
 backoff_delay_seconds: int,
 service: str,
 passing: bool,
 dc: str):
 super().__init__(watch_seconds, backoff_delay_seconds)
 dc: str,
 caller: str):
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.service = service
 self.health_client = health_client
 self.passing = passing
Expand All@@ -407,6 +409,7 @@ def __init__(self,
 service=self.service,
 passing=self.passing,
 dc=self.dc,
 caller=self.caller
 )
 self.cache = {self.service: service_health}

Expand All@@ -418,7 +421,8 @@ def _update_cache(self):
 'passing': self.passing,
 'index': self.index,
 'wait': self.watch_seconds,
 'dc': self.dc
 'dc': self.dc,
 'caller': self.caller
 }
 log.debug(f'Param for health query: {params}')
 self.index, values = self.health_client.service(**params)
Expand DownExpand Up@@ -459,8 +463,9 @@ def __init__(self,
 total_timeout: int,
 recurse: bool,
 consistency_mode: ConsistencyMode,
 caller: str,
 cache_initial_warmup_timeout=None):
 super().__init__(watch_seconds, backoff_delay_seconds)
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.kv_client = kv_client
 self.path = path
 self.recurse = recurse
Expand All@@ -470,7 +475,8 @@ def __init__(self,
 self.index, kv = kv_client.get(
 key=path,
 recurse=recurse,
 total_timeout=self._get_warmup_timeout()
 total_timeout=self._get_warmup_timeout(),
 caller=self.caller
 )
 self.cache = {self.path: kv}

Expand All@@ -491,7 +497,8 @@ def _update_cache(self):
 'wait': self.watch_seconds,
 'total_timeout': self.total_timeout,
 'consistency': self.consistency_mode,
 'recurse': self.recurse
 'recurse': self.recurse,
 'caller': self.caller
 }
 log.debug(f'Param for kv query: {params}')
 self.index, values = self.kv_client.get(**params)
Expand DownExpand Up@@ -1596,6 +1603,7 @@ def register(
 ttl=None,
 http=None,
 timeout=None,
 caller=None,
 enable_tag_override=False):
 """
 Add a new service to the local agent. There is more
Expand DownExpand Up@@ -1629,6 +1637,8 @@ def register(
 *script*, *interval*, *ttl*, *http*, and *timeout* arguments
 are deprecated. use *check* instead.

 *caller* is a name of caller service.

 *enable_tag_override* is an optional bool that enable you
 to modify a service tags from servers(consul agent role server)
 Default is set to False.
Expand All@@ -1637,7 +1647,7 @@ def register(
 for more information
 https://www.consul.io/docs/agent/services.html
 """

 params = []
 payload = {}

 payload['name'] = name
Expand All@@ -1658,6 +1668,9 @@ def register(
 if weights:
 payload['weights'] = weights

 if caller:
 params.append(('caller', caller))

 else:
 payload.update(Check._compat(
 script=script,
Expand All@@ -1675,22 +1688,28 @@ def register(
 CB.bool(),
 path='/v1/agent/service/register',
 headers=headers,
 params=params,
 data=json.dumps(payload))

 def deregister(self, service_id, token=None):
 def deregister(self, service_id, caller=None, token=None):
 """
 Used to remove a service from the local agent. The agent will
 take care of deregistering the service with the Catalog. If
 there is an associated check, that is also deregistered.
 """

 params = []
 headers = {}
 token = token or self.agent.token
 if token:
 headers['X-Consul-Token'] = token
 if caller:
 params.append(('caller', caller))
 return self.agent.http.put(
 CB.bool(),
 path='/v1/agent/service/deregister/%s' % service_id,
 headers=headers
 headers=headers,
 params=params
 )

 def maintenance(self, service_id, enable, reason=None, token=None):
Expand DownExpand Up@@ -2935,7 +2954,8 @@ def service(self,
 dc=None,
 near=None,
 token=None,
 node_meta=None):
 node_meta=None,
 caller=None):
 """
 Returns a tuple of (*index*, *nodes*)

Expand DownExpand Up@@ -2963,6 +2983,8 @@ def service(self,

 *node_meta* is an optional meta data used for filtering, a
 dictionary formatted as {k1:v1, k2:v2}.

 *caller* is a name of caller service.
 """
 params = []
 headers = {}
Expand All@@ -2987,6 +3009,8 @@ def service(self,
 for nodemeta_name, nodemeta_value in node_meta.items():
 params.append(('node-meta', '{0}:{1}'.
 format(nodemeta_name, nodemeta_value)))
 if caller:
 params.append(('caller', caller))
 return self.agent.http.get(
 CB.json(index=True),
 path='/v1/health/service/%s' % service,
Expand DownExpand Up@@ -3167,7 +3191,8 @@ def get(
 keys=False,
 separator=None,
 dc=None,
 total_timeout=None):
 total_timeout=None,
 caller=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3203,6 +3228,8 @@ def get(
 "Session": "adf4238a-882b-9ddc-4a9d-5b6758e4159e"
 }

 *caller* is a name of caller service.

 Note, if the requested key does not exists *(index, None)* is
 returned. It's then possible to long poll on the index for when the
 key is created.
Expand DownExpand Up@@ -3234,6 +3261,8 @@ def get(
 consistency = consistency or self.agent.consistency
 if consistency in ('consistent', 'stale'):
 params.append((consistency, '1'))
 if caller:
 params.append(('caller', caller))

 one = False
 decode = False
Expand Down

2 changes: 1 addition & 1 deletion
sonar-project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
# Required metadata
sonar.projectKey=com.github:poppyred:python-consul2
sonar.projectName=Python Consul2 HH
sonar.projectVersion=0.2.5
sonar.projectVersion=0.2.6

# Comma-separated paths to directories with sources (required)
sonar.sources=consul
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
HH-137449 add 'caller' as a param for request Consul#9

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

 Merged

nicholasgribanov
merged 2 commits into

from

Sep 29, 2021
 Merged


HH-137449 add 'caller' as a param for request Consul
#9
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
ecba430

HH-137449 add 'caller' as a param for request Consul


nicholasgribanov Sep 29, 2021
c7128e2

Bump version: 0.2.5 → 0.2.6


nicholasgribanov Sep 29, 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


2 changes: 1 addition & 1 deletion
.bumpversion.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = True
current_version = 0.2.5
current_version = 0.2.6
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
serialize = 
	{major}.{minor}.{patch}-{release}
Expand Down

2 changes: 1 addition & 1 deletion
consul/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = '0.2.5'
__version__ = '0.2.6'

from consul.base import ACLDisabled # noqa
from consul.base import ACLPermissionDenied # noqa
Expand Down

53 changes: 41 additions & 12 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,9 +350,10 @@ class ConsulCacheBase(metaclass=abc.ABCMeta):
 calls to wait for changes since this query was last run.
 """

 def __init__(self, watch_seconds: str, backoff_delay_seconds: int):
 def __init__(self, watch_seconds: str, backoff_delay_seconds: int, caller: str):
 self.cache = dict()
 self.callbacks = []
 self.caller = caller
 self.watch_seconds = watch_seconds
 self.backoff_delay_seconds = backoff_delay_seconds
 self.index = None
Expand DownExpand Up@@ -397,8 +398,9 @@ def __init__(self,
 backoff_delay_seconds: int,
 service: str,
 passing: bool,
 dc: str):
 super().__init__(watch_seconds, backoff_delay_seconds)
 dc: str,
 caller: str):
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.service = service
 self.health_client = health_client
 self.passing = passing
Expand All@@ -407,6 +409,7 @@ def __init__(self,
 service=self.service,
 passing=self.passing,
 dc=self.dc,
 caller=self.caller
 )
 self.cache = {self.service: service_health}

Expand All@@ -418,7 +421,8 @@ def _update_cache(self):
 'passing': self.passing,
 'index': self.index,
 'wait': self.watch_seconds,
 'dc': self.dc
 'dc': self.dc,
 'caller': self.caller
 }
 log.debug(f'Param for health query: {params}')
 self.index, values = self.health_client.service(**params)
Expand DownExpand Up@@ -459,8 +463,9 @@ def __init__(self,
 total_timeout: int,
 recurse: bool,
 consistency_mode: ConsistencyMode,
 caller: str,
 cache_initial_warmup_timeout=None):
 super().__init__(watch_seconds, backoff_delay_seconds)
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.kv_client = kv_client
 self.path = path
 self.recurse = recurse
Expand All@@ -470,7 +475,8 @@ def __init__(self,
 self.index, kv = kv_client.get(
 key=path,
 recurse=recurse,
 total_timeout=self._get_warmup_timeout()
 total_timeout=self._get_warmup_timeout(),
 caller=self.caller
 )
 self.cache = {self.path: kv}

Expand All@@ -491,7 +497,8 @@ def _update_cache(self):
 'wait': self.watch_seconds,
 'total_timeout': self.total_timeout,
 'consistency': self.consistency_mode,
 'recurse': self.recurse
 'recurse': self.recurse,
 'caller': self.caller
 }
 log.debug(f'Param for kv query: {params}')
 self.index, values = self.kv_client.get(**params)
Expand DownExpand Up@@ -1596,6 +1603,7 @@ def register(
 ttl=None,
 http=None,
 timeout=None,
 caller=None,
 enable_tag_override=False):
 """
 Add a new service to the local agent. There is more
Expand DownExpand Up@@ -1629,6 +1637,8 @@ def register(
 *script*, *interval*, *ttl*, *http*, and *timeout* arguments
 are deprecated. use *check* instead.

 *caller* is a name of caller service.

 *enable_tag_override* is an optional bool that enable you
 to modify a service tags from servers(consul agent role server)
 Default is set to False.
Expand All@@ -1637,7 +1647,7 @@ def register(
 for more information
 https://www.consul.io/docs/agent/services.html
 """

 params = []
 payload = {}

 payload['name'] = name
Expand All@@ -1658,6 +1668,9 @@ def register(
 if weights:
 payload['weights'] = weights

 if caller:
 params.append(('caller', caller))

 else:
 payload.update(Check._compat(
 script=script,
Expand All@@ -1675,22 +1688,28 @@ def register(
 CB.bool(),
 path='/v1/agent/service/register',
 headers=headers,
 params=params,
 data=json.dumps(payload))

 def deregister(self, service_id, token=None):
 def deregister(self, service_id, caller=None, token=None):
 """
 Used to remove a service from the local agent. The agent will
 take care of deregistering the service with the Catalog. If
 there is an associated check, that is also deregistered.
 """

 params = []
 headers = {}
 token = token or self.agent.token
 if token:
 headers['X-Consul-Token'] = token
 if caller:
 params.append(('caller', caller))
 return self.agent.http.put(
 CB.bool(),
 path='/v1/agent/service/deregister/%s' % service_id,
 headers=headers
 headers=headers,
 params=params
 )

 def maintenance(self, service_id, enable, reason=None, token=None):
Expand DownExpand Up@@ -2935,7 +2954,8 @@ def service(self,
 dc=None,
 near=None,
 token=None,
 node_meta=None):
 node_meta=None,
 caller=None):
 """
 Returns a tuple of (*index*, *nodes*)

Expand DownExpand Up@@ -2963,6 +2983,8 @@ def service(self,

 *node_meta* is an optional meta data used for filtering, a
 dictionary formatted as {k1:v1, k2:v2}.

 *caller* is a name of caller service.
 """
 params = []
 headers = {}
Expand All@@ -2987,6 +3009,8 @@ def service(self,
 for nodemeta_name, nodemeta_value in node_meta.items():
 params.append(('node-meta', '{0}:{1}'.
 format(nodemeta_name, nodemeta_value)))
 if caller:
 params.append(('caller', caller))
 return self.agent.http.get(
 CB.json(index=True),
 path='/v1/health/service/%s' % service,
Expand DownExpand Up@@ -3167,7 +3191,8 @@ def get(
 keys=False,
 separator=None,
 dc=None,
 total_timeout=None):
 total_timeout=None,
 caller=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3203,6 +3228,8 @@ def get(
 "Session": "adf4238a-882b-9ddc-4a9d-5b6758e4159e"
 }

 *caller* is a name of caller service.

 Note, if the requested key does not exists *(index, None)* is
 returned. It's then possible to long poll on the index for when the
 key is created.
Expand DownExpand Up@@ -3234,6 +3261,8 @@ def get(
 consistency = consistency or self.agent.consistency
 if consistency in ('consistent', 'stale'):
 params.append((consistency, '1'))
 if caller:
 params.append(('caller', caller))

 one = False
 decode = False
Expand Down

2 changes: 1 addition & 1 deletion
sonar-project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
# Required metadata
sonar.projectKey=com.github:poppyred:python-consul2
sonar.projectName=Python Consul2 HH
sonar.projectVersion=0.2.5
sonar.projectVersion=0.2.6

# Comma-separated paths to directories with sources (required)
sonar.sources=consul
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
HH-137449 add 'caller' as a param for request Consul#9

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

 Merged

nicholasgribanov
merged 2 commits into

from

Sep 29, 2021
 Merged


HH-137449 add 'caller' as a param for request Consul
#9
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
ecba430

HH-137449 add 'caller' as a param for request Consul


nicholasgribanov Sep 29, 2021
c7128e2

Bump version: 0.2.5 → 0.2.6


nicholasgribanov Sep 29, 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


2 changes: 1 addition & 1 deletion
.bumpversion.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = True
current_version = 0.2.5
current_version = 0.2.6
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
serialize = 
	{major}.{minor}.{patch}-{release}
Expand Down

2 changes: 1 addition & 1 deletion
consul/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = '0.2.5'
__version__ = '0.2.6'

from consul.base import ACLDisabled # noqa
from consul.base import ACLPermissionDenied # noqa
Expand Down

53 changes: 41 additions & 12 deletions
consul/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -350,9 +350,10 @@ class ConsulCacheBase(metaclass=abc.ABCMeta):
 calls to wait for changes since this query was last run.
 """

 def __init__(self, watch_seconds: str, backoff_delay_seconds: int):
 def __init__(self, watch_seconds: str, backoff_delay_seconds: int, caller: str):
 self.cache = dict()
 self.callbacks = []
 self.caller = caller
 self.watch_seconds = watch_seconds
 self.backoff_delay_seconds = backoff_delay_seconds
 self.index = None
Expand DownExpand Up@@ -397,8 +398,9 @@ def __init__(self,
 backoff_delay_seconds: int,
 service: str,
 passing: bool,
 dc: str):
 super().__init__(watch_seconds, backoff_delay_seconds)
 dc: str,
 caller: str):
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.service = service
 self.health_client = health_client
 self.passing = passing
Expand All@@ -407,6 +409,7 @@ def __init__(self,
 service=self.service,
 passing=self.passing,
 dc=self.dc,
 caller=self.caller
 )
 self.cache = {self.service: service_health}

Expand All@@ -418,7 +421,8 @@ def _update_cache(self):
 'passing': self.passing,
 'index': self.index,
 'wait': self.watch_seconds,
 'dc': self.dc
 'dc': self.dc,
 'caller': self.caller
 }
 log.debug(f'Param for health query: {params}')
 self.index, values = self.health_client.service(**params)
Expand DownExpand Up@@ -459,8 +463,9 @@ def __init__(self,
 total_timeout: int,
 recurse: bool,
 consistency_mode: ConsistencyMode,
 caller: str,
 cache_initial_warmup_timeout=None):
 super().__init__(watch_seconds, backoff_delay_seconds)
 super().__init__(watch_seconds, backoff_delay_seconds, caller)
 self.kv_client = kv_client
 self.path = path
 self.recurse = recurse
Expand All@@ -470,7 +475,8 @@ def __init__(self,
 self.index, kv = kv_client.get(
 key=path,
 recurse=recurse,
 total_timeout=self._get_warmup_timeout()
 total_timeout=self._get_warmup_timeout(),
 caller=self.caller
 )
 self.cache = {self.path: kv}

Expand All@@ -491,7 +497,8 @@ def _update_cache(self):
 'wait': self.watch_seconds,
 'total_timeout': self.total_timeout,
 'consistency': self.consistency_mode,
 'recurse': self.recurse
 'recurse': self.recurse,
 'caller': self.caller
 }
 log.debug(f'Param for kv query: {params}')
 self.index, values = self.kv_client.get(**params)
Expand DownExpand Up@@ -1596,6 +1603,7 @@ def register(
 ttl=None,
 http=None,
 timeout=None,
 caller=None,
 enable_tag_override=False):
 """
 Add a new service to the local agent. There is more
Expand DownExpand Up@@ -1629,6 +1637,8 @@ def register(
 *script*, *interval*, *ttl*, *http*, and *timeout* arguments
 are deprecated. use *check* instead.

 *caller* is a name of caller service.

 *enable_tag_override* is an optional bool that enable you
 to modify a service tags from servers(consul agent role server)
 Default is set to False.
Expand All@@ -1637,7 +1647,7 @@ def register(
 for more information
 https://www.consul.io/docs/agent/services.html
 """

 params = []
 payload = {}

 payload['name'] = name
Expand All@@ -1658,6 +1668,9 @@ def register(
 if weights:
 payload['weights'] = weights

 if caller:
 params.append(('caller', caller))

 else:
 payload.update(Check._compat(
 script=script,
Expand All@@ -1675,22 +1688,28 @@ def register(
 CB.bool(),
 path='/v1/agent/service/register',
 headers=headers,
 params=params,
 data=json.dumps(payload))

 def deregister(self, service_id, token=None):
 def deregister(self, service_id, caller=None, token=None):
 """
 Used to remove a service from the local agent. The agent will
 take care of deregistering the service with the Catalog. If
 there is an associated check, that is also deregistered.
 """

 params = []
 headers = {}
 token = token or self.agent.token
 if token:
 headers['X-Consul-Token'] = token
 if caller:
 params.append(('caller', caller))
 return self.agent.http.put(
 CB.bool(),
 path='/v1/agent/service/deregister/%s' % service_id,
 headers=headers
 headers=headers,
 params=params
 )

 def maintenance(self, service_id, enable, reason=None, token=None):
Expand DownExpand Up@@ -2935,7 +2954,8 @@ def service(self,
 dc=None,
 near=None,
 token=None,
 node_meta=None):
 node_meta=None,
 caller=None):
 """
 Returns a tuple of (*index*, *nodes*)

Expand DownExpand Up@@ -2963,6 +2983,8 @@ def service(self,

 *node_meta* is an optional meta data used for filtering, a
 dictionary formatted as {k1:v1, k2:v2}.

 *caller* is a name of caller service.
 """
 params = []
 headers = {}
Expand All@@ -2987,6 +3009,8 @@ def service(self,
 for nodemeta_name, nodemeta_value in node_meta.items():
 params.append(('node-meta', '{0}:{1}'.
 format(nodemeta_name, nodemeta_value)))
 if caller:
 params.append(('caller', caller))
 return self.agent.http.get(
 CB.json(index=True),
 path='/v1/health/service/%s' % service,
Expand DownExpand Up@@ -3167,7 +3191,8 @@ def get(
 keys=False,
 separator=None,
 dc=None,
 total_timeout=None):
 total_timeout=None,
 caller=None):
 """
 Returns a tuple of (*index*, *value[s]*)

Expand DownExpand Up@@ -3203,6 +3228,8 @@ def get(
 "Session": "adf4238a-882b-9ddc-4a9d-5b6758e4159e"
 }

 *caller* is a name of caller service.

 Note, if the requested key does not exists *(index, None)* is
 returned. It's then possible to long poll on the index for when the
 key is created.
Expand DownExpand Up@@ -3234,6 +3261,8 @@ def get(
 consistency = consistency or self.agent.consistency
 if consistency in ('consistent', 'stale'):
 params.append((consistency, '1'))
 if caller:
 params.append(('caller', caller))

 one = False
 decode = False
Expand Down

2 changes: 1 addition & 1 deletion
sonar-project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
# Required metadata
sonar.projectKey=com.github:poppyred:python-consul2
sonar.projectName=Python Consul2 HH
sonar.projectVersion=0.2.5
sonar.projectVersion=0.2.6

# Comma-separated paths to directories with sources (required)
sonar.sources=consul
Expand Down