particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild: remove ability to pass in secrets

Browse source 
The way secrets work has been changed via commit 372b117: instead
of passing them in via the command line, the information how to
obtain secrets are encoded along the sources themselves.
The only stage that still has support for the old style way is the
deprecated org.osbuild.dnf stage, which might be removed in the
near future.
This commit is contained in:
Christian Kellner 2020-07-07 17:22:31 +02:00 • committed by David Rheinsberg
parent 9fd28c8c21
commit e3eccbe491
3 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
osbuild/main_cli.py
View file

@ -86,8 +86,6 @@ def parse_arguments(sys_argv):
help="directory where intermediary os trees are stored")
parser.add_argument("--sources", metavar="FILE", type=os.path.abspath,
help="json file containing a dictionary of source configuration")
parser.add_argument("--secrets", metavar="FILE", type=os.path.abspath,
help="json file containing a dictionary of secrets that are passed to sources")
parser.add_argument("-l", "--libdir", metavar="DIRECTORY", type=os.path.abspath,
help="the directory containing stages, assemblers, and the osbuild library")
parser.add_argument("--checkpoint", metavar="ID", action="append", type=str, default=None,
@ -127,11 +125,6 @@ def osbuild_cli(*, sys_argv):
pipeline = osbuild.load(pipeline, sources_options)
secrets = {}
if args.secrets:
with open(args.secrets) as f:
secrets = json.load(f)
if args.checkpoint:
missed = mark_checkpoints(pipeline, args.checkpoint)
if missed:
@ -153,7 +146,6 @@ def osbuild_cli(*, sys_argv):
args.store,
interactive=not args.json,
libdir=args.libdir,
secrets=secrets,
output_directory=args.output_directory
)
except KeyboardInterrupt: