PATCH: minor fixes for builds

Author: chuckorde

.gitlab-ci.yml

@@ -1,6 +1,6 @@
 ############################# Helper Anchors ##################################
 
-
+.use_github_repo: &use_github_repo |
         eval $(ssh-agent -s)
         ssh-add ~/.ssh/${GITHUB_HOST}
 
@@ -71,8 +71,8 @@ SCA Test: # run SCA on any branch
     tags:
         - python
 
-    script: 
-        - curl -sSL https://download.sourceclear.com/ci.sh | bash 
+    script:
+        - curl -sSL https://download.sourceclear.com/ci.sh | bash
     #       | tee sca_results.txt
     #
     # artifacts:
@@ -89,14 +89,14 @@ SAST Sandbox Test: # this only runs on the dev branch, so run a Sandbox scan
     tags:
         - python
 
-    script: 
-        - zip project.zip 
+    script:
+        - zip project.zip
           setup.* LICENCE.txt -r $(echo ${CI_PROJECT_NAME} | cut -d'-' -f1)
         - pip3 install veracode-python
 
         - veracode-cli scan
             --app="${CI_PROJECT_NAME}"
-            --name="$(date) - ${CI_COMMIT_SHORT_SHA}" 
+            --name="$(date) - ${CI_COMMIT_SHORT_SHA}"
             --sandbox='Development Build'
             --files='project.zip'
             --timeout=30
@@ -112,15 +112,14 @@ SAST Policy Test: # this is on master so run a SAST policy scan
     tags:
         - python
 
-    script: 
-        - zip project.zip 
+    script:
+        - zip project.zip
           setup.* LICENCE.txt -r $(echo ${CI_PROJECT_NAME} | cut -d'-' -f1)
-        # - pip3 install veracode-python
-        - pip3 install -e .
+        - pip3 install veracode-python
 
         - veracode-cli scan
             --app="${CI_PROJECT_NAME}"
-            --name="$(date) - ${CI_COMMIT_SHORT_SHA}" 
+            --name="$(date) - ${CI_COMMIT_SHORT_SHA}"
             --files='project.zip'
             --timeout=30
 
@@ -133,7 +132,7 @@ Create Release: # increment version and create release tag
         - python
 
     script:
-        - *use_gitlab_repo        
+        - *use_gitlab_repo
         - git pull origin master
         - git checkout master
         - export RELEASE=$(git log -1 --pretty='format:%B' | cut -d':' -f1)
@@ -146,15 +145,16 @@ Create Release: # increment version and create release tag
         - git tag -a v${VERSION} -m "Release ${VERSION}"
         - git push origin v${VERSION}
 
-    only: 
-        - master 
+    only:
+        - master
 
 Mirror to Github: # mirror Github and use API to create release
     stage: publish
     tags:
         - python
 
     script:
+        - *use_gitlab_repo
         - git pull origin master
         - git checkout master
         - echo 'Packaging version: ' $(python3 setup.py -d version)
@@ -164,15 +164,16 @@ Mirror to Github: # mirror Github and use API to create release
         - pip3 install requests # needed for github release
         - python3 setup.py github --create-release ${GITHUB_API_TOKEN}
 
-    only: 
-        - master 
+    only:
+        - master
 
 Publish to PyPi: # publish on PyPi
     stage: publish
-    tags: 
+    tags:
         - python
 
     script:
+        - *use_gitlab_repo
         - git pull origin master
         - git checkout master
 
@@ -181,6 +182,6 @@ Publish to PyPi: # publish on PyPi
         - python3 setup.py sdist
         - twine upload -u ${TWINE_USERNAME} -p ${TWINE_PASSWORD} dist/*
 
-    only: 
-        - master 
+    only:
+        - master
 

veracode/build.py

@@ -66,6 +66,14 @@ def __init__(self, obj=None, app=None):
                 self.analysis = Analysis(info.build)
                 self.policy = Policy(info.build)
 
+    @property
+    def name(self):
+        return self.version
+
+    @name.setter
+    def name(self, name):
+        self.version = name
+
     def upload(self, files, compress=False):
         if isinstance(files, list):
             self._modules = [os.path.expanduser(f) for f in files]
@@ -128,11 +136,11 @@ def __init__(self, obj=None):
         self._properties = [
             'analysis_type',
             'engine_version',
-            'publish_date',
+            'published_date',
             'status'
         ]
         self._renamed_properties = [
-                'type', 'engine_version','publish_date','status']
+                'type', 'engine_version','published_date','status']
         self._update_properties()
 
         if hasattr(obj, 'analysis_unit'):
@@ -154,7 +162,7 @@ def __init__(self, obj=None):
             'policy_version'
         ]
         self._renamed_properties = [
-                'compliance', 'name', 'updated', 'version']
+                'compliance', 'name', 'updated_date', 'version']
         self._update_properties(obj)
 
     def __repr__(self):
@@ -196,7 +204,7 @@ def __repr__(self):
             self.sandbox_name = None
         return ("<Veracode Report: application='{}', sandbox='{}',"
                 "build='{}', flaws={}>".format(
-                     self._app_name, self.sandbox_name,
+                     self.app_name, self.sandbox_name,
                      self._build.version, self.total_flaws))
 
 class Flaw(Properties):