parallelvirtualcluster/pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 113 Wiki Activity

Integrate version hardcoding into CLI

Browse Source 
The get_distribution load was very heavy, so follow the other parts and
just hardcode the version in. Also update bump-version to work with this
and with the new pyproject.toml configuration, and add a custom
user-agent to the API requests leveraging this version.
This commit is contained in:
Joshua Boniface 2025-03-17 18:05:44 -04:00
parent 5831c3a425
commit e5c8318b8e
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bump-version
View File

@ -22,7 +22,8 @@ sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," node-d
sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," health-daemon/pvchealthd/Daemon.py sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," health-daemon/pvchealthd/Daemon.py
sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," worker-daemon/pvcworkerd/Daemon.py sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," worker-daemon/pvcworkerd/Daemon.py
sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," api-daemon/pvcapid/Daemon.py sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," api-daemon/pvcapid/Daemon.py
sed -i "s,version=\"${current_version}\",version=\"${new_version}\"," client-cli/setup.py sed -i "s,version = \"${current_version}\",version = \"${new_version}\"," client-cli/pyproject.toml
sed -i "s,VERSION = \"${current_version}\",VERSION = \"${new_version}\"," client-cli/pvc/cli/cli.py
echo ${new_version} > .version echo ${new_version} > .version
changelog_tmpdir=$( mktemp -d ) changelog_tmpdir=$( mktemp -d )

7
client-cli/pvc/cli/cli.py
View File

@ -51,6 +51,8 @@ import click
############################################################################### ###############################################################################
VERSION = "0.9.107"
CONTEXT_SETTINGS = dict( CONTEXT_SETTINGS = dict(
help_option_names=["-h", "--help"], max_content_width=MAX_CONTENT_WIDTH help_option_names=["-h", "--help"], max_content_width=MAX_CONTENT_WIDTH
) )
@ -97,10 +99,7 @@ def version(ctx, param, value):
if not value or ctx.resilient_parsing: if not value or ctx.resilient_parsing:
return return
from pkg_resources import get_distribution echo(CLI_CONFIG, f"Parallel Virtual Cluster CLI client version {VERSION}")
version = get_distribution("pvc").version
echo(CLI_CONFIG, f"Parallel Virtual Cluster CLI client version {version}")
ctx.exit() ctx.exit()

4
client-cli/pvc/lib/common.py
View File

@ -27,6 +27,7 @@ from requests import get, post, put, patch, delete, Response
from requests.exceptions import ConnectionError from requests.exceptions import ConnectionError
from time import time from time import time
from urllib3 import disable_warnings from urllib3 import disable_warnings
from pvc.cli.cli import VERSION
def format_bytes(size_bytes): def format_bytes(size_bytes):
@ -166,6 +167,9 @@ def call_api(
config["api_scheme"], config["api_host"], config["api_prefix"], request_uri config["api_scheme"], config["api_host"], config["api_prefix"], request_uri
) )
# Add custom User-Agent header
headers["User-Agent"] = f"pvc-client-cli/{VERSION}"
# Craft the authentication header if required # Craft the authentication header if required
if config["api_key"]: if config["api_key"]:
headers["X-Api-Key"] = config["api_key"] headers["X-Api-Key"] = config["api_key"]