Allow API Version to be explicitly specified in env var or cmd options

Signed-off-by: Peter Goodman <pete@petegoo.com>
anchore · Sep 16, 2018 · 541b2c3 · 541b2c3
1 parent b833540
commit 541b2c3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/anchorecli/cli/__init__.py b/anchorecli/cli/__init__.py
@@ -16,20 +16,22 @@
 @click.option('--u', help='Username (or use environment variable ANCHORE_CLI_USER)')
 @click.option('--p', help='Password (or use environment variable ANCHORE_CLI_PASS)')
 @click.option('--url', help='Service URL (or use environment variable ANCHORE_CLI_URL)')
+@click.option('--api-version', help='Explicitly specify the API version to skip checking. Useful when swagger endpoint is inaccessible')
 @click.option('--insecure', is_flag=True, help='Skip SSL cert checks (or use environment variable ANCHORE_CLI_SSL_VERIFY=<y/n>)')
 @click.option('--json', is_flag=True, help='Output raw API JSON')
 
 @click.version_option(version=version.version)
 @click.pass_context
 #@extended_help_option(extended_help="extended help")
-def main_entry(ctx, debug, u, p, url, insecure, json):
+def main_entry(ctx, debug, u, p, url, api_version, insecure, json):
     if debug:
         logging.basicConfig(level=logging.DEBUG)
 
     cli_opts = {
         'u': u,
         'p': p,
         'url': url,
+        'api-version': api_version,
         'insecure': insecure,
         'json': json,
         'debug': debug

diff --git a/anchorecli/cli/utils.py b/anchorecli/cli/utils.py
@@ -26,6 +26,7 @@ def setup_config(cli_opts):
         'user':None,
         'pass':None,
         'url':"http://localhost:8228/v1",
+        'api-version': None,
         'ssl_verify':True,
         'jsonmode':False,
         'debug':False,
@@ -50,7 +51,7 @@ def setup_config(cli_opts):
                         raise Exception("invalid credentials file format")
 
                     default_creds = ydata.get('default', {})
-                    for e in ['ANCHORE_CLI_USER', 'ANCHORE_CLI_PASS', 'ANCHORE_CLI_URL', 'ANCHORE_CLI_SSL_VERIFY']:
+                    for e in ['ANCHORE_CLI_USER', 'ANCHORE_CLI_PASS', 'ANCHORE_CLI_URL', 'ANCHORE_CLI_API_VERSION', 'ANCHORE_CLI_SSL_VERIFY']:
                         if e in default_creds:
                             settings[e] = default_creds[e]
                 except Exception as err:
@@ -61,7 +62,7 @@ def setup_config(cli_opts):
 
     # load environment if present
     try:
-        for e in ['ANCHORE_CLI_USER', 'ANCHORE_CLI_PASS', 'ANCHORE_CLI_URL', 'ANCHORE_CLI_SSL_VERIFY', 'ANCHORE_CLI_JSON', 'ANCHORE_CLI_DEBUG']:
+        for e in ['ANCHORE_CLI_USER', 'ANCHORE_CLI_PASS', 'ANCHORE_CLI_URL', 'ANCHORE_CLI_API_VERSION', 'ANCHORE_CLI_SSL_VERIFY', 'ANCHORE_CLI_JSON', 'ANCHORE_CLI_DEBUG']:
             if e in os.environ:
                 settings[e] = os.environ[e]
     except Exception as err:
@@ -78,6 +79,9 @@ def setup_config(cli_opts):
         if cli_opts['url']:
             settings['ANCHORE_CLI_URL'] = cli_opts['url']
 
+        if cli_opts['api-version']:
+            settings['ANCHORE_CLI_API_VERSION'] = cli_opts['api-version']
+
         if cli_opts['insecure']:
             settings['ANCHORE_CLI_SSL_VERIFY'] = "n"
 
@@ -98,6 +102,8 @@ def setup_config(cli_opts):
         if 'ANCHORE_CLI_URL' in settings:
             ret['url'] = settings['ANCHORE_CLI_URL']
 
+        if 'ANCHORE_CLI_API_VERSION' in settings:
+            ret['api-version'] = settings['ANCHORE_CLI_API_VERSION']
         if 'ANCHORE_CLI_SSL_VERIFY' in settings:
             if settings['ANCHORE_CLI_SSL_VERIFY'].lower() == 'n':
                 ret['ssl_verify'] = False

diff --git a/anchorecli/clients/apiexternal.py b/anchorecli/clients/apiexternal.py
@@ -163,6 +163,8 @@ def detect_api_version(config):
     :param config:
     :return: tuple of ints
     """
+    if config['api-version']:
+        return tuple([int(x) for x in config['api-version'].split('.')])
 
     url = urlparse(config['url'])
     url = urlunparse((url.scheme, url.netloc, '/swagger.json', url.params, url.query, url.fragment))