Working cli base <safety pete>

Author: chuckorde

setup.py

@@ -17,7 +17,10 @@
     'Click>=7.0',
 ]
 keywords = []
-entry_points = {'console_scripts': ['veracode-cli=veracode.cli:main']}
+entry_points = {'console_scripts': [
+    'veracode-cli=veracode.old:main',
+    'veracode=veracode.cli.cli:main'
+    ]}
 python_requires='>= 3.5'
 
 author = 'Chuck Orde'

veracode/application.py

@@ -24,15 +24,17 @@ def __new__(self, name=None, sandbox=None, build=None):
             return NewApplication()
 
     @classmethod
-    def list(self):
+    def list(self, name_only=True):
         """ Returns a list of applications for the current account
 
         >>> apps = Application.list()
         >>> isinstance(apps, list)
         True
         """
         apps = SDK.upload.GetAppList()
-        return [app.app_name for app in apps.app]
+        if name_only:
+            return [app.app_name for app in apps.app]
+        return [ExistingApplication(app) for app in apps.app]
 
 
 class NewApplication(object):
@@ -336,12 +338,15 @@ def build(self, obj):
         else:
             if isinstance(obj, basestring):
                 self._build = self._get_build_by_name(obj)
-            if isinstance(obj, build.NewBuild):
-                new_build = SDK.upload.CreateBuild(
+
+            elif isinstance(obj, build.NewBuild):
+                try:
+                    self._build = self._get_build_by_name(obj.version)
+                except:
+                    new_build = SDK.upload.CreateBuild(
                             version=obj.version,
                             app_id=self.id,
                             sandbox_id=self.sandbox.id)
-
-            self._build = build.NewBuild(app=self, obj=new_build)
+                    self._build = build.NewBuild(app=self, obj=new_build)
         self._builds = []
 

veracode/build.py

@@ -47,24 +47,39 @@ def __init__(self, obj=None, app=None):
         self._renamed_properties = ['id', 'version']
         self._update_properties(obj)
 
-        self.info = Info()
-        self.analysis = Analysis()
-        self.policy = Policy()
-
+        self._info = None
         self._report = None
         self._modules = []
 
-        if not self.version:
-            # match the Veracode default
-            self.version = datetime.today().strftime("%d %b %Y Static")
+        if obj:
+            self.obj = obj
+            if hasattr(obj, 'build'):
+                self.version = obj.build.version
+
+    def _get_build_info(self):
+        if self._info is None:
+            try:
+                self._info = SDK.upload.GetBuildInfo(
+                                        app_id=self._app.id,
+                                        build_id=self.id)
+            except VeracodeInvalidArgumentError:
+                raise VeracodeBuildError(
+                        'The application does not have any builds.')
+
+    @property
+    def info(self):
+        self._get_build_info()
+        return Info(self._info.build)
+
+    @property
+    def analysis(self):
+        self._get_build_info()
+        return Analysis(self._info.build)
 
-        if self._app.id:
-            info = SDK.upload.GetBuildInfo(app_id=self._app.id,
-                                           build_id=self.id)
-            if hasattr(info, 'build'):
-                self.info = Info(info.build)
-                self.analysis = Analysis(info.build)
-                self.policy = Policy(info.build)
+    @property
+    def policy(self):
+        self._get_build_info()
+        return Policy(self._info.build)
 
     @property
     def name(self):
@@ -202,7 +217,7 @@ def exists(obj, prop):
     def __repr__(self):
         if not hasattr(self, 'sandbox_name'):
             self.sandbox_name = None
-        return ("<Veracode Report: application='{}', sandbox='{}',"
+        return ("<Veracode Report: application='{}', sandbox='{}', "
                 "build='{}', flaws={}>".format(
                      self.app_name, self.sandbox_name,
                      self._build.version, self.total_flaws))

veracode/cli/__init__.py

@@ -0,0 +1 @@
+import os, sys; sys.path.append(os.path.dirname(os.path.realpath(__file__)))

veracode/cli/app/__init__.py

@@ -0,0 +1,71 @@
+import click
+import sys
+from veracode.application import Application
+from veracode.sandbox import Sandbox
+
+@click.group()
+def app():
+    pass
+
+
+@app.command()
+def list():
+    for app in Application.list():
+        click.echo(app)
+
+
+@app.command()
+@click.option('--name', '-n', required=True)
+@click.option('--criticality', '-c', required=True, type=click.Choice(
+    [ 'Very High', 'High', 'Medium', 'Low', 'Very Low' ]))
+
+@click.option('--sandbox', '-s')
+def create(name, criticality, sandbox=None):
+    app = Application()
+    app.name = name
+    app.business_criticality = criticality
+    app = app.save()
+    if sandbox:
+        sbx = Sandbox()
+        sbx.name = sandbox
+        app.sandbox = sbx
+
+
+@app.command()
+@click.option('--name', '-n', required=True,
+        help='Name of application to update')
+@click.confirmation_option('--force', '-f',
+        help='Suppress prompt before removal.',
+        prompt='Are you sure you want to delete this application')
+def delete(name):
+    app = Application(name)
+    return app.delete()
+
+
+@app.command()
+@click.option('--name', '-n', required=True,
+        help='Name of application to update.')
+@click.option('--rename', '-r',
+        help='New name for the application.')
+@click.option('--criticality', '-c', type=click.Choice(
+        [ 'Very High', 'High', 'Medium', 'Low', 'Very Low' ],
+        case_sensitive=True), # update app to snake case so we can go -i
+        help='New criticality for the application.')
+
+def update(name, rename=None, criticality=None):
+    # this isn't the right way to do this, google more
+    if not (rename or criticality):
+        with click.Context(update) as ctx:
+            click.echo(update.get_help(ctx))
+        sys.exit(('\nError: You must supply either "--rename / -r" '
+                  'or "--criticality / -c"'))
+    app = Application(name)
+    app.name = rename
+    app.business_criticality = '{}'.format(criticality)
+    app.save()
+
+
+@app.command()
+def scan():
+    click.echo('scan')
+

veracode/cli/app/commands.py

@@ -0,0 +1,17 @@
+import click
+from app import commands as app
+from sandbox import commands as sandbox
+from user import commands as user
+from report import commands as report
+
+@click.group()
+def main():
+    pass
+
+main.add_command(app.app)
+main.add_command(sandbox.sandbox)
+main.add_command(user.user)
+main.add_command(report.report)
+
+if __name__ == '__main__':
+    main()

veracode/cli/cli.py

@@ -0,0 +1,22 @@
+import click
+
+@click.group()
+def report():
+    pass
+
+@report.command()
+def list():
+    click.echo('list')
+
+@report.command()
+def create():
+    click.echo('create')
+
+@report.command()
+def delete():
+    click.echo('delete')
+
+@report.command()
+def update():
+    click.echo('update')
+