Skip to content

Commit

Permalink
chore: Update charm libraries (#183)
Browse files Browse the repository at this point in the history
  • Loading branch information
telcobot committed Jul 12, 2024
1 parent 08fed32 commit dc2fef2
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions lib/charms/lego_base_k8s/v0/lego_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def _plugin_config(self):

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 11
LIBPATCH = 12


logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -224,11 +224,13 @@ def _push_csr_to_workload(self, csr: str) -> None:

def _execute_lego_cmd(self) -> bool:
"""Execute lego command in workload container."""
if (app_env:=self._app_environment):
logger.info("Running the Lego command with %s environment variables", app_env)
process = self._container.exec(
self._cmd,
timeout=300,
working_dir="/tmp",
environment=self._app_environment | self._plugin_config,
environment=app_env | self._plugin_config,
)
try:
stdout, error = process.wait_output()
Expand Down Expand Up @@ -331,10 +333,7 @@ def _app_environment(self) -> Dict[str, str]:
env["HTTP_PROXY"] = http_proxy
if (https_proxy := get_env_var(env_var="JUJU_CHARM_HTTPS_PROXY")):
env["HTTPS_PROXY"] = https_proxy
# there's no need for no_proxy if there's no http_proxy or https_proxy
if(
no_proxy := get_env_var(env_var="JUJU_CHARM_NO_PROXY")
) and (http_proxy and https_proxy):
if(no_proxy := get_env_var(env_var="JUJU_CHARM_NO_PROXY")):
env["NO_PROXY"] = no_proxy
return env

Expand Down

0 comments on commit dc2fef2

Please sign in to comment.