Merge pull request #8 from synkd/refactor_manifester_settings

Refactor settings and reformat multiple files

README.md

@@ -20,9 +20,9 @@ pip install .
 ```
 # Configuration
 
-The `manifester_settings.yaml` file is used to configure manifester via [DynaConf](https://github.com/rochacbruno/dynaconf/). 
+The `manifester_settings.yaml` file is used to configure manifester via [DynaConf](https://github.com/rochacbruno/dynaconf/).
 
-Multiple types of manifests can be configured in the `manifest_category` section of `manifester_settings.yaml`. These types can be differentiated based on the Satellite version of the subscription allocation, the names and quantities of the subscriptions to be added to the manifest, and whether [Simple Content Access](https://access.redhat.com/documentation/en-us/subscription_central/2021/html-single/getting_started_with_simple_content_access/index) is enabled on the manifest. 
+Multiple types of manifests can be configured in the `manifest_category` section of `manifester_settings.yaml`. These types can be differentiated based on the Satellite version of the subscription allocation, the names and quantities of the subscriptions to be added to the manifest, and whether [Simple Content Access](https://access.redhat.com/documentation/en-us/subscription_central/2021/html-single/getting_started_with_simple_content_access/index) is enabled on the manifest.
 
 The value of the `name` setting for each subscription in a manifest must exactly match the name of a subscription available in the account which was used to generate the offline token. One method for determining the subscription names available in an account is to register a system to RHSM and then run `subscription manager list --available` on that system. A planned future feature of Manifester is a CLI command that will return a list of available subscriptions.
 
@@ -32,4 +32,4 @@ Currently, the only action supported by the manifester CLI is generating a manif
 ```
 manifester get-manifest --manifest-category <manifest category name> --allocation_name <allocation name>
 ```
- Two options are available for this subcommand. The `--manifest_category` option is required and must match one of the manifest categories defined in `manifester_settings.yaml`. The `--allocation_name` option specifies the name of the subscription allocation in RHSM and is also used in the file name of the manifest archive exported by Manifester. If no value is supplied for `--allocation_name`, a string of 10 random alphabetic characters will be used for the allocation name. 
+ Two options are available for this subcommand. The `--manifest_category` option is required and must match one of the manifest categories defined in `manifester_settings.yaml`. The `--allocation_name` option specifies the name of the subscription allocation in RHSM and is also used in the file name of the manifest archive exported by Manifester. If no value is supplied for `--allocation_name`, a string of 10 random alphabetic characters will be used for the allocation name.

manifester/commands.py

@@ -1,18 +1,23 @@
 import click
 
-from manifester import logger as mlog
-from manifester.settings import settings
 from manifester import Manifester
 
+
 # To do: add a command for returning subscription pools
 @click.group
 def cli():
     pass
 
 
 @cli.command()
-@click.option("--manifest_category", type=str, help="Category of manifest (golden_ticket or robottelo_automation by default)")
-@click.option("--allocation_name", type=str, help="Name of upstream subscription allocation")
+@click.option(
+    "--manifest_category",
+    type=str,
+    help="Category of manifest (golden_ticket or robottelo_automation by default)",
+)
+@click.option(
+    "--allocation_name", type=str, help="Name of upstream subscription allocation"
+)
 def get_manifest(manifest_category, allocation_name):
     manifester = Manifester(manifest_category, allocation_name)
     manifester.create_subscription_allocation()

manifester/helpers.py

@@ -9,7 +9,7 @@ def simple_retry(cmd, cmd_args=None, cmd_kwargs=None, max_timeout=240, _cur_time
     cmd_kwargs = cmd_kwargs if cmd_kwargs else {}
     # If additional debug information is needed, the following log entry can be modified to
     # include the data being passed by adding {cmd_kwargs=} to the f-string. Please do so
-    # with caution as some data (notably the offline token) should be treated as a secret. 
+    # with caution as some data (notably the offline token) should be treated as a secret.
     logger.debug(f"Sending request to endpoint {cmd_args}")
     response = cmd(*cmd_args, **cmd_kwargs)
     logger.debug(f"Response status code is {response.status_code}")