Skip to content

Rename --name to --secret-name and add support in vault. #45

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
kbens merged 2 commits into from
Nov 5, 2024
Merged

Rename --name to --secret-name and add support in vault. #45

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
425203f
poc name refactor
kbens Nov 5, 2024
f77ebfb
Fixed secret name syntax
kbens Nov 5, 2024
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
28 changes: 17 additions & 11 deletions psst/psst.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ def secrets():
default="base",
show_default=True,
help="The secrets list to generate [base,pcm,oci]")
@click.option('-n', '--name',
help="Generate specific named secrets",
@click.option('-sn', '--secret-name',
help="Name of a specific secret to generate",
multiple=True)
@click.option('-p','--prefix',
default="",
help="Add a prefix to the secret names")
@click.option('-s','--suffix',
default="",
help="Add a suffix to the secret names")
def generate(secrets_list, name, prefix, suffix):
def generate(secrets_list, secret_name, prefix, suffix):
"""Generate a dictionary of secrets"""
secrets_dict = psst.secrets.util.generate_secrets(name, secrets_list, prefix, suffix)
secrets_dict = psst.secrets.util.generate_secrets(secrets_list, secret_name, prefix, suffix)
click.echo(json.dumps(secrets_dict, indent=4))

@cli.group()
Expand All @@ -50,8 +50,8 @@ def vault():
@click.option('-t','--type', default="oci",
show_default=True,
help="The type of vault to create")
@click.option('-n','--name', required=True,
help="")
@click.option('-vn','--vault-name', required=True,
help="The name of the vault")
@click.option('-c','--compartment-id', required=True,
help="Set the compartment for the vault, key and secrets")
@click.option('-r','--region',
Expand All @@ -60,18 +60,21 @@ def vault():
default="base",
show_default=True,
help="The secrets list to generate [base,pcm,oci]")
@click.option('-sn', '--secret-name',
help="Name of a specific secret to generate",
multiple=True)
@click.option('-p','--prefix',
default="",
help="Add a prefix to the secret names")
@click.option('-s','--suffix',
default="",
help="Add a suffix to the secret names")
def create(type, name, compartment_id, region, secrets_list, prefix, suffix):
def create(type, vault_name, compartment_id, region, secrets_list, secret_name, prefix, suffix):
"""Create a vault with generated secrets."""
if type == "oci":
ocicfg = psst.vault.oci.config(region)
secrets_dict = psst.secrets.util.generate_secrets(False, secrets_list, prefix, suffix)
vault = psst.vault.oci.create(ocicfg, name, compartment_id, secrets_dict)
secrets_dict = psst.secrets.util.generate_secrets(secrets_list, secret_name, prefix, suffix)
vault = psst.vault.oci.create(ocicfg, vault_name, compartment_id, secrets_dict)

@vault.command("update")
@click.option('-t','--type',
Expand All @@ -90,16 +93,19 @@ def create(type, name, compartment_id, region, secrets_list, prefix, suffix):
default="base",
show_default=True,
help="The secrets list to generate [base,pcm,oci]")
@click.option('-sn', '--secret-name',
help="Name of a specific secret to generate",
multiple=True)
@click.option('-p','--prefix',
default="",
help="Add a prefix to the secret names")
@click.option('-s','--suffix',
default="",
help="Add a suffix to the secret names")
def update(type, vault, key, compartment_id, region, secrets_list, prefix, suffix):
def update(type, vault, key, compartment_id, region, secrets_list, secret_name, prefix, suffix):
"""Update a vault with generated secrets."""

if type == "oci":
ocicfg = psst.vault.oci.config(region) # set region local here vs passing to function?
secrets_dict = psst.secrets.util.generate_secrets(False, secrets_list, prefix, suffix)
secrets_dict = psst.secrets.util.generate_secrets(secrets_list, secret_name, prefix, suffix)
vault = psst.vault.oci.update(ocicfg, vault, key, compartment_id, secrets_dict)
12 changes: 7 additions & 5 deletions psst/secrets/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import psst.secrets
from inspect import getmembers, ismodule

def generate_secrets(name, secrets_list, prefix, suffix):
def generate_secrets(secrets_list, secret_name, prefix, suffix):

dict = {}
secrets = []

if name:
# If named secrets, use that list
for n in name:
secrets.append(n) if n in dir(psst.secrets) else print(n + " is not a valid secret name, ignoring.")
if secret_name:
for n in secret_name:
if n in dir(eval("psst.secrets." + secrets_list)):
secrets.append(n)
else:
raise ValueError(f"Secret name '{n}' is not a valid name in the '{secrets_list}' list.")
else:
list_module = eval("psst.secrets." + secrets_list )
for module in getmembers(list_module, ismodule):
Expand Down