From d4b5cae604b2c224ba6f04f6b77ecd593785d2c2 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Tue, 15 Sep 2020 20:53:08 +0200 Subject: [PATCH] plugin/builder: global constants for default urls Use a global constant for the composer and kojib hub URLs instead of defining them in the source twice. --- plugins/builder/osbuild.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/builder/osbuild.py b/plugins/builder/osbuild.py index 0fdc919..84e3333 100644 --- a/plugins/builder/osbuild.py +++ b/plugins/builder/osbuild.py @@ -31,6 +31,10 @@ import koji from koji.tasks import BaseTaskHandler +DEFAULT_COMPOSER_URL = "http://localhost:8701/" +DEFAULT_KOJIHUB_URL = "https://localhost/kojihub" + + # The following classes are a implementation of osbuild composer's # koji API. It is based on the corresponding OpenAPI specification # version '1' and should model it closely. @@ -209,8 +213,8 @@ class OSBuildImage(BaseTaskHandler): cfg = configparser.ConfigParser() cfg.read_dict({ - "composer": {"url": "http://localhost:8701/"}, - "koji": {"url": "https://localhost/kojihub"} + "composer": {"url": DEFAULT_COMPOSER_URL}, + "koji": {"url": DEFAULT_KOJIHUB_URL} }) cfg.read([ @@ -363,7 +367,7 @@ def main(): parser = argparse.ArgumentParser(description="osbuild composer koji API client") parser.add_argument("--url", metavar="URL", type=str, - default="http://localhost:8701/", + default=DEFAULT_COMPOSER_URL, help="The URL of the osbuild composer koji API endpoint") parser.set_defaults(cmd=None) sp = parser.add_subparsers(help='commands') @@ -380,7 +384,7 @@ def main(): subpar.add_argument("--format", metavar="FORMAT", help='Request the image format [qcow2]', action="append", type=str, default=[]) subpar.add_argument("--koji", metavar="URL", help='The koji url', - default="https://localhost/kojihub") + default=DEFAULT_KOJIHUB_URL) subpar.set_defaults(cmd='compose') subpar = sp.add_parser("status", help='status of a compose')