Merge branch 'develop'

Author: Jordan Mance

.github/workflows/test.yml

@@ -31,6 +31,9 @@ jobs:
           scripts/install.sh
 
       - name: Run E2E Test Suite
+        env:
+          FIGGY_DISABLE_KEYRING: true
+          OVERRIDE_KEYRING: true
         run: |
           export TERM=linux
           export TERMINFO=/etc/terminfo
@@ -62,6 +65,7 @@ jobs:
 #          scripts/install.sh
 #      - name: Run E2E Test Suite
 #        env:
+#          FIGGY_DISABLE_KEYRING: true
 #          OVERRIDE_KEYRING: true
 #          GOOGLE_IDP_ID: ${{ secrets.GOOGLE_IDP_ID }}
 #          GOOGLE_SP_ID: ${{ secrets.GOOGLE_SP_ID }}
@@ -99,6 +103,7 @@ jobs:
 
       - name: Run E2E Test Suite
         env:
+          FIGGY_DISABLE_KEYRING: true
           OVERRIDE_KEYRING: true
           OKTA_SSO_USER: ${{ secrets.OKTA_SSO_USER }}
           OKTA_SSO_PASSWORD: ${{ secrets.OKTA_SSO_PASSWORD }}
@@ -120,8 +125,6 @@ jobs:
           python-version: 3.8
 
       - name: Install dependencies
-        env:
-          FIGGY_TEST: true
         run: |
           sudo apt-get update \
           && sudo apt-get install libusb-1.0-0-dev libxmu-dev libxmu-headers \
@@ -136,15 +139,19 @@ jobs:
 
       - name: Run E2E Test Suite
         env:
+          FIGGY_DISABLE_KEYRING: true
           OVERRIDE_KEYRING: true
-          CONFIG_FILE: ${{ secrets.CONFIG_FILE }}
-          CREDENTIALS_FILE: ${{ secrets.CREDENTIALS_FILE }}
+          CONFIG_DEFAULT: ${{ secrets.CONFIG_FILE }}
+          CREDENTIALS_FILE: ${{ secrets.QA_TESTER_CREDENTIALS_FILE }}
+          CONFIG_FILE: ${{ secrets.QA_TESTER_CONFIG_FILE }}
+          AWS_REGION: us-east-1
         run: |
           mkdir -p ~/.aws
-          echo "$CONFIG_FILE" > ~/.aws/config
           echo "$CREDENTIALS_FILE" > ~/.aws/credentials
+          echo "$CONFIG_FILE" > ~/.aws/config
 
+          cat ~/.aws/config
           export TERM=linux
           export TERMINFO=/etc/terminfo
           cd cli
-          python run_tests.py profile default
+          python run_tests.py profile figgy-qa-tester

cli/CHANGELOG.md

@@ -1,5 +1,8 @@
 Figgy Changelog:
 
+## 0.0.34
+- Forcing release to address brew issue
+
 ## 0.0.33
 - Adding a set of default places to search for the figgy.json file to reduce keystrokes.
 
@@ -11,7 +14,7 @@ Figgy Changelog:
 only with the user's locally configured & targeted AWSCLI profile. This will be very useful for CICD builds and for
 some teams who only have a single AWS account.
 
-- Renaming `figgy` package to `figcli` to prevent name collission shenanigans with the new `figgy-lib` package. 
+- Renaming `figgy` package to `figcli` to prevent name collission shenanigans with the new `figgy-lib` package.
 
 ## 0.0.30a
 - Naming figgy.json properties to their new 'figgy'names.

cli/figcli/commands/help/upgrade.py

@@ -20,6 +20,8 @@ def __init__(self, help_context: HelpContext):
         self._utils = Utils(colors_enabled=help_context.defaults.colors_enabled)
 
     def upgrade(self):
+        self._utils.error_exit("This command has been deprecated and disabled. Please use the standard upgrade process"
+                               "through `homebrew` or `pip`.")
         latest_version: FiggyVersionDetails = self.tracker.get_version()
 
         if latest_version.version == VERSION:

cli/figcli/config/constants.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-VERSION = '0.0.33'
+VERSION = '0.0.34'
 CLI_NAME = 'figgy'
 PROJECT_NAME = 'figgy'
 
@@ -13,6 +13,9 @@
 FIGGY_GET_VERSION_URL = f"{FIGGY_OBS_API_BASE_URL}/v1/version"
 FIGGY_LOG_METRICS_URL = f"{FIGGY_OBS_API_BASE_URL}/v1/log-metrics"
 
+# Homebrew
+BREW_FORMULA = 'mancej/figgy/figgy'
+
 # Role names are assumed to be prefixed with `figgy-` - Users may override by setting the below ENV variable.
 FIGGY_ROLE_NAME_PREFIX = 'figgy-'
 FIGGY_ROLE_PREFIX_OVERRIDE_ENV = 'FIGGY_ROLE_PREFIX_OVERRIDE'

cli/figcli/svcs/observability/version_tracker.py

@@ -94,14 +94,14 @@ def print_new_version_msg(c: Color, new_details: FiggyVersionDetails):
             print(f"Current Version: {c.fg_yl}{VERSION}{c.rs}")
             print(f"New Version: {c.fg_bl}{new_details.version}{c.rs}")
             print(f"To see what the new version has in store for you, run `{CLI_NAME} --version`")
-            print(f"To upgrade, run `brew upgrade figgy` or `pip install figgy-cli --upgrade`")
+            print(f"To upgrade, run `brew upgrade {BREW_FORMULA}` or `pip install figgy-cli --upgrade`")
             print(f'{c.fg_bl}------------------------------------------{c.rs}')
         else:
             print(f'\n{c.fg_bl}------------------------------------------{c.rs}')
-            print(f'Figgy was rolled back due to a major issue and you\'re on a bad version!')
+            print(f'Figgy was rolled back due to an issue and you\'re on a bad version!')
             print(f"Current Version: {c.fg_yl}{VERSION}{c.rs}")
             print(f"Recommended Version: {c.fg_bl}{new_details.version}{c.rs}")
-            print(f"To roll-back, run `brew upgrade figgy` or `pip install figgy-cli --upgrade`")
+            print(f"To roll-back, run `brew upgrade {BREW_FORMULA}` or `pip install figgy-cli --upgrade`")
             print(f'{c.fg_bl}------------------------------------------{c.rs}')
 
     @staticmethod

cli/figcli/test/cli/dev/validate.py

@@ -1,5 +1,5 @@
 import sys
-
+import time
 import pexpect
 
 from figcli.test.cli.config import *
@@ -23,7 +23,10 @@ def run(self):
 
     def validate_success(self):
         sync = DevSync(extra_args=self.extra_args)
+        sync.prep_sync()
         sync.sync_success()
+        print("Sleeping to give time for replication")
+        time.sleep(50)
 
         print(f"Testing: {CLI_NAME} config {Utils.get_first(validate)} --env {DEFAULT_ENV} "
               f"--config figcli/test/assets/success/figgy.json {self.extra_args}")

cli/figcli/test/cli/sso/okta/configure.py

@@ -8,10 +8,9 @@
 class ConfigureOkta(FiggyTest):
     def __init__(self, role_type: str):
         self._role_type = role_type
-        super().__init__(pexpect.spawn(f'{CLI_NAME} --{Utils.get_first(configure)} --skip-upgrade',
-                                       encoding='utf-8', timeout=10))
-        # self._child = pexpect.spawn(f'{CLI_NAME} --{Utils.get_first(configure)} --skip-upgrade',
-        #                                encoding='utf-8', timeout=10)
+        super().__init__(None)
+        self._child = pexpect.spawn(f'{CLI_NAME} --{Utils.get_first(configure)} --skip-upgrade',
+                                       encoding='utf-8', timeout=10)
 
     def run(self):
         self.step(f"Testing `{CLI_NAME} --{Utils.get_first(configure)}`")

cli/run_tests.py

@@ -84,7 +84,7 @@ def main():
         # Login to DEV Role
         print_test("Google DEV Login")
         ConfigureGoogle('dev').run()
-        dev_tests()
+        dev_tests(key_down_to_shared=1)
 
         clear_cache()
 
@@ -96,7 +96,7 @@ def main():
         # Login to DEV Role
         print_test("Bastion DEV Login")
         DevLogin(BASTION_ENV).run()
-        dev_tests()
+        dev_tests(key_down_to_shared=1)
 
         clear_cache()
         # Login to data role
@@ -107,7 +107,7 @@ def main():
     elif auth_type.lower() == 'okta':
         print_test("OKTA DEV Login")
         ConfigureOkta('dev').run()
-        dev_tests()
+        dev_tests(key_down_to_shared=1)
 
         clear_cache()
 
@@ -117,11 +117,11 @@ def main():
         data_tests()
 
     elif auth_type.lower() == 'profile':
-        dev_tests(profile=profile)
+        dev_tests(profile=profile, key_down_to_shared=4)
         clear_cache()
 
 
-def dev_tests(profile=None):
+def dev_tests(profile=None, key_down_to_shared=4):
     extra_args = f"--profile {profile}" if profile else ""
 
     run_test("Dev Put", DevPut(extra_args=extra_args))
@@ -132,7 +132,8 @@ def dev_tests(profile=None):
     run_test("Dev Audit", DevAudit(extra_args=extra_args))
     run_test("Dev Sync", DevSync(extra_args=extra_args))
     run_test("Dev Cleanup", DevCleanup(extra_args=extra_args))
-    run_test("Dev Browse", DevBrowse(extra_args=extra_args, key_down_to_shared=4))
+    print(f"Key down: {key_down_to_shared}")
+    run_test("Dev Browse", DevBrowse(extra_args=extra_args, key_down_to_shared=key_down_to_shared))
     run_test("Dev Restore", DevRestore(extra_args=extra_args))
     run_test("Dev Export", DevExport(extra_args=extra_args))
     run_test("Dev Edit", DevEdit(extra_args=extra_args))

things_to_figure_out.md

@@ -9,6 +9,7 @@ These are problems I intend to solve, once I figure out the best way to do it.
 - Make CLI used shared libs.
 - Fix "requests" dependency on legacy botocore layer thing
 - CW alarm email integration
+- Canary rollout automation
 
 ## Ideas:
 - `figgy --reset` or `figgy reset`