Compare commits

..

5 Commits

Author SHA1 Message Date
0b90f37518 Bump version to 0.9.66 2023-08-27 11:41:22 -04:00
33205273dc Fix missing YAML load 2023-08-27 11:41:10 -04:00
1e083d7652 Bump version to 0.9.65 2023-08-23 01:56:57 -04:00
65d2b7869c Restore original no-connection behavior
Previously not specifying a connection when multiple were available
would error. This restores that behaviour.
2023-08-23 01:38:50 -04:00
66aee73f1d Fix incorrect short flags in node list 2023-08-22 09:26:35 -04:00
7 changed files with 33 additions and 12 deletions

View File

@ -1 +1 @@
0.9.64 0.9.66

View File

@ -1,5 +1,14 @@
## PVC Changelog ## PVC Changelog
###### [v0.9.66](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.66)
* [CLI] Fixes a missing YAML import in CLI
###### [v0.9.65](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.65)
* [CLI] Fixes a bug in the node list filtering command
* [CLI] Fixes a bug/default when no connection is specified
###### [v0.9.64](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.64) ###### [v0.9.64](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.64)
**Breaking Change [CLI]**: The CLI client root commands have been reorganized. The following commands have changed: **Breaking Change [CLI]**: The CLI client root commands have been reorganized. The following commands have changed:

View File

@ -27,7 +27,7 @@ from ssl import SSLContext, TLSVersion
from distutils.util import strtobool as dustrtobool from distutils.util import strtobool as dustrtobool
# Daemon version # Daemon version
version = "0.9.64" version = "0.9.66"
# API version # API version
API_VERSION = 1.0 API_VERSION = 1.0

View File

@ -27,6 +27,8 @@ from os import environ, makedirs, path
from pkg_resources import get_distribution from pkg_resources import get_distribution
from lxml.etree import fromstring, tostring from lxml.etree import fromstring, tostring
from re import sub from re import sub
from yaml import load as yload
from yaml import SafeLoader as SafeYAMLLoader
from pvc.cli.helpers import * from pvc.cli.helpers import *
from pvc.cli.waiters import * from pvc.cli.waiters import *
@ -850,14 +852,14 @@ def cli_node_info(
help="Limit list to nodes in the specified daemon state.", help="Limit list to nodes in the specified daemon state.",
) )
@click.option( @click.option(
"-ds", "-cs",
"--coordinator-state", "--coordinator-state",
"coordinator_state_filter", "coordinator_state_filter",
default=None, default=None,
help="Limit list to nodes in the specified coordinator state.", help="Limit list to nodes in the specified coordinator state.",
) )
@click.option( @click.option(
"-ds", "-vs",
"--domain-state", "--domain-state",
"domain_state_filter", "domain_state_filter",
default=None, default=None,
@ -4510,7 +4512,7 @@ def cli_provisioner_userdata_add(name, filename):
userdata = filename.read() userdata = filename.read()
filename.close() filename.close()
try: try:
yaml.load(userdata, Loader=yaml.SafeLoader) yload(userdata, Loader=SafeYAMLLoader)
except Exception as e: except Exception as e:
echo("Error: Userdata document is malformed") echo("Error: Userdata document is malformed")
cleanup(False, e) cleanup(False, e)
@ -4599,7 +4601,7 @@ def cli_provisioner_userdata_modify(name, filename, editor):
filename.close() filename.close()
try: try:
yaml.load(userdata, Loader=yaml.SafeLoader) yload(userdata, Loader=SafeYAMLLoader)
except Exception as e: except Exception as e:
echo("Error: Userdata document is malformed") echo("Error: Userdata document is malformed")
cleanup(False, e) cleanup(False, e)
@ -5600,11 +5602,8 @@ def cli(
global CLI_CONFIG global CLI_CONFIG
store_data = get_store(store_path) store_data = get_store(store_path)
# If no connection is specified, use the first connection in the store
if _connection is None:
CLI_CONFIG = get_config(store_data, list(store_data.keys())[0])
# If the connection isn't in the store, mark it bad but pass the value # If the connection isn't in the store, mark it bad but pass the value
elif _connection not in store_data.keys(): if _connection is not None and _connection not in store_data.keys():
CLI_CONFIG = {"badcfg": True, "connection": _connection} CLI_CONFIG = {"badcfg": True, "connection": _connection}
else: else:
CLI_CONFIG = get_config(store_data, _connection) CLI_CONFIG = get_config(store_data, _connection)

View File

@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name="pvc", name="pvc",
version="0.9.64", version="0.9.66",
packages=["pvc.cli", "pvc.lib"], packages=["pvc.cli", "pvc.lib"],
install_requires=[ install_requires=[
"Click", "Click",

13
debian/changelog vendored
View File

@ -1,3 +1,16 @@
pvc (0.9.66-0) unstable; urgency=high
* [CLI] Fixes a missing YAML import in CLI
-- Joshua M. Boniface <joshua@boniface.me> Sun, 27 Aug 2023 11:36:05 -0400
pvc (0.9.65-0) unstable; urgency=high
* [CLI] Fixes a bug in the node list filtering command
* [CLI] Fixes a bug/default when no connection is specified
-- Joshua M. Boniface <joshua@boniface.me> Wed, 23 Aug 2023 01:56:57 -0400
pvc (0.9.64-0) unstable; urgency=high pvc (0.9.64-0) unstable; urgency=high
**Breaking Change [CLI]**: The CLI client root commands have been reorganized. The following commands have changed: **Breaking Change [CLI]**: The CLI client root commands have been reorganized. The following commands have changed:

View File

@ -49,7 +49,7 @@ import re
import json import json
# Daemon version # Daemon version
version = "0.9.64" version = "0.9.66"
########################################################## ##########################################################