Adding default figgy.json paths

Author: Jordan Mance

cli/CHANGELOG.md

@@ -1,5 +1,8 @@
 Figgy Changelog:
 
+## 0.0.33
+- Adding a set of default places to search for the figgy.json file to reduce keystrokes.
+
 ## 0.0.32
 - Testing release pipeline through pypi, brew, etc.
 

cli/figcli/commands/config/cleanup.py

@@ -16,7 +16,6 @@
 
 
 class Cleanup(ConfigCommand):
-    _DEFAULT_PATH = './figgy.json'
     """
     Detects orphaned ParameterStore names, replication configurations, and merge keys, then
     prompts the user to delete them. This is typically run after the `sync` command informs
@@ -32,7 +31,7 @@ def __init__(self, ssm: SsmDao, ddb: ConfigDao, context: ConfigContext,
         self._utils = Utils(colors_enabled)
         self.example = f"{self.c.fg_bl}{CLI_NAME} config {self.command_printable} --env dev " \
             f"--config /path/to/figgy.json{self.c.rs}"
-        self._config_path = context.ci_config_path if context.ci_config_path else Cleanup._DEFAULT_PATH
+        self._config_path = context.ci_config_path if context.ci_config_path else Utils.find_figgy_json()
 
         # If user passes in --info flag, we don't need all of this to be initialized.
         if not hasattr(args, Utils.get_first(info)) or args.info is False:

cli/figcli/commands/config/generate.py

@@ -13,11 +13,10 @@
 
 
 class Generate(ConfigCommand):
-    _DEFAULT_PATH = './figgy.json'
 
     def __init__(self, colors_enabled: bool, config_context: ConfigContext):
         super().__init__(generate, colors_enabled, config_context)
-        self._from_path = config_context.from_path if config_context.from_path else Generate._DEFAULT_PATH
+        self._from_path = config_context.ci_config_path if config_context.ci_config_path else Utils.find_figgy_json()
         self._utils = Utils(colors_enabled)
         self._errors_detected = False
         self.example = f"{self.c.fg_bl}{CLI_NAME} config {self.command_printable} " \

cli/figcli/commands/config/sync.py

@@ -18,14 +18,13 @@
 
 
 class Sync(ConfigCommand):
-    _DEFAULT_PATH = './figgy.json'
 
     def __init__(self, ssm_init: SsmDao, config_init: ConfigDao, colors_enabled: bool,
                  context: ConfigContext, get: Get, put: Put):
         super().__init__(sync, colors_enabled, context)
         self._config = config_init
         self._ssm = ssm_init
-        self._config_path = context.ci_config_path if context.ci_config_path else Sync._DEFAULT_PATH
+        self._config_path = context.ci_config_path if context.ci_config_path else Utils.find_figgy_json()
         self._utils = Utils(colors_enabled)
         self._replication_only = context.replication_only
         self._errors_detected = False

cli/figcli/commands/config/validate.py

@@ -10,12 +10,11 @@
 
 
 class Validate(ConfigCommand):
-    _DEFAULT_PATH = './figgy.json'
 
     def __init__(self, ssm_init: SsmDao, colors_enabled: bool, context: ConfigContext):
         super().__init__(validate, colors_enabled, context)
         self._ssm = ssm_init
-        self._config_path = context.ci_config_path if context.ci_config_path else Validate._DEFAULT_PATH
+        self._config_path = context.ci_config_path if context.ci_config_path else Utils.find_figgy_json()
         self._utils = Utils(colors_enabled)
         self._replication_only = context.replication_only
         self._errors_detected = False

cli/figcli/config/constants.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-VERSION = '0.0.32'
+VERSION = '0.0.33'
 CLI_NAME = 'figgy'
 PROJECT_NAME = 'figgy'
 
@@ -147,4 +147,7 @@
 
 # This is only used for temporary sandbox sessions. This reduces user friction when experimenting by not having to interact
 # with authenticating their OS Keychain.
-DEFAULT_ENCRYPTION_KEY = 'wX1C0nK1glfzaWQU8SKukdS7XZgYlAMW5ueb_V3cfSE='
+DEFAULT_ENCRYPTION_KEY = 'wX1C0nK1glfzaWQU8SKukdS7XZgYlAMW5ueb_V3cfSE='
+
+# Default paths to search for figgy.json in
+DEFAULT_FIGGY_JSON_PATHS = ['figgy.json', 'figgy/figgy.json', 'config/figgy.json', '_figgy/figgy.json', '.figgy/figgy.json']

cli/figcli/utils/utils.py

@@ -90,6 +90,14 @@ def is_mac():
     def is_windows():
         return platform.system() == WINDOWS
 
+    @staticmethod
+    def find_figgy_json():
+        for path in DEFAULT_FIGGY_JSON_PATHS:
+            if Path(path).is_file():
+                return path
+
+        return 'figgy.json'
+
     @staticmethod
     def file_exists(path: str):
         return Path(path).is_file()

cli/scripts/release.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 
-. scripts/utils.sh
-
-version=$1
-
-[[ -z "$version" ]] && die "Required parameter [version] is missing." || success "Creating release tag for version: $version"
-
+SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+version=$(cat "$SCRIPTPATH/../figcli/config/constants.py"| grep -E "VERSION\s+=\s+" | grep -v "AUDIT" | sed -E "s#.*([0-9]+.[0-9]+.[0-9]+[a-zA-Z]?).*#\1#g")
 
 git tag -fa "v$version" -m "Tagging commit" && git push origin --tags