Merge pull request #30 from fecgov/release/sprint-3

Release/sprint 3

.circleci/config.yml

@@ -0,0 +1,124 @@
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# See: https://circleci.com/docs/2.0/orb-intro/
+orbs:
+  # See the orb documentation here: https://circleci.com/developer/orbs/orb/circleci/python
+  python: circleci/[email protected]
+
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  test:
+    # These next lines defines a Docker executors: https://circleci.com/docs/2.0/executor-types/
+    # A list of available CircleCI Docker convenience images are available here: https://circleci.com/developer/images/image/cimg/python
+    docker:
+      - image: cimg/python:3.8-node
+
+    steps:
+      - checkout
+
+      - run:
+          name: Create unified requirements so CircleCI can cache them
+          command: |
+            cat requirements.txt > requirements-all.txt
+            echo >> requirements-all.txt  # blank in case new newline at end of requirements.txt
+            cat requirements-test.txt >> requirements-all.txt
+
+      # default settings in python/install-packages has trouble resolving
+      # dependencies and takes a very long time
+      - run:
+          name: install Python packages
+          command:
+            pip install --use-deprecated=legacy-resolver -r requirements-all.txt
+
+#      - python/install-packages:
+#          pkg-manager: pip
+#          pip-dependency-file: requirements-all.txt
+
+      - run:
+          name: Run tests, save a coverage report, and save coverage percentage
+          command: |
+            pytest --cov=.  --cov-report=xml --cov-report=html --cov-report=term || EXIT_CODE=$?
+            if [ $EXIT_CODE == "0" ]; then
+              echo "Tests ran successfully"
+            elif [ $EXIT_CODE == "5" ]; then
+              echo "No tests found. Continuing."
+            else
+              echo "Unit test errors. pytest exited with $EXIT_CODE."
+              exit 1
+            fi
+
+      - store_artifacts:
+          path: htmlcov
+
+      # Sonar cloud setup and scanning
+      - run:
+          name: Create sonar-scanner cache directory if it doesn't exist
+          command: mkdir -p /tmp/cache/scanner
+      - restore_cache:
+          keys:
+            - v1-sonarcloud-scanner-4.6.2.2472
+      - run:
+          name: SonarCloud
+          command: |
+            set -e
+            VERSION=4.6.2.2472
+            if [ -z "$SONAR_TOKEN" ]; then
+                 echo "You must set SONAR_TOKEN environemnt variable"
+                 exit 1
+            fi
+            SCANNER_DIRECTORY=/tmp/cache/scanner
+            export SONAR_USER_HOME=$SCANNER_DIRECTORY/.sonar
+            OS="linux"
+            echo $SONAR_USER_HOME
+            if [[ ! -x "$SCANNER_DIRECTORY/sonar-scanner-$VERSION-$OS/bin/sonar-scanner" ]]; then
+              curl -Ol https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$VERSION-$OS.zip
+              unzip -qq -o sonar-scanner-cli-$VERSION-$OS.zip -d $SCANNER_DIRECTORY
+            fi
+
+            chmod +x $SCANNER_DIRECTORY/sonar-scanner-$VERSION-$OS/bin/sonar-scanner
+            chmod +x $SCANNER_DIRECTORY/sonar-scanner-$VERSION-$OS/jre/bin/java
+            $SCANNER_DIRECTORY/sonar-scanner-$VERSION-$OS/bin/sonar-scanner
+          environment:
+            SONARQUBE_SCANNER_PARAMS: '{"sonar.host.url":"https://sonarcloud.io"}'
+      - save_cache:
+          key: v1-sonarcloud-scanner-4.6.2.2472
+          paths: /tmp/cache/scanner
+
+  dependency-check:
+    docker:
+      - image: cimg/python:3.8
+
+    steps:
+      - checkout
+
+      - python/install-packages:
+          pkg-manager: pip
+          pip-dependency-file: requirements-test.txt
+
+      - run:
+          name: Run depency check
+          command: |
+            export today=$(date "+%Y-%m-%d")
+
+            # gather up the -i ignore IDs fro safety check
+            export ignores=$(
+            grep -vE "^\s*#" .safety.dependency.ignore |  # print out any non-comment line
+              grep "[0-9]" |  # filter out any line that doesn't have a number in it
+              awk -v "today=${today}" '{ if ($2 > today || $2 == "") print "-i", $1}' | # print any line with date after today
+              xargs echo  # put all the output from previous command on one line
+            )
+            export command="safety check -r requirements.txt --full-report $ignores"
+
+            echo "----------------------------------------------------"
+            echo "If you need to modify the ignore list for the safety"
+            echo "check, edit .safety.dependency.ignore file"
+            echo "----------------------------------------------------"
+            eval $command
+
+# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+workflows:
+  test:
+    jobs:
+      - test
+      - dependency-check

.github/ISSUE_TEMPLATE/issue-template.md

@@ -0,0 +1,18 @@
+---
+name: Issue template
+about: Issue template for fecfile-imagegenerator
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Business Reason ### 
+
+As a [role], I will be able to [blank] so that I can [business reason]
+
+### Acceptance Criteria ### 
+
+**If** [precedent]
+**When** [action]
+**Then** [result]

.safety.dependency.ignore

@@ -0,0 +1,13 @@
+# Any  vulnerability ID numbers listed in this file will be ignored when
+# running the safety dependency check. Each line should have the ID number
+# and a date. The ID will be ignored by the CI pipeline check unitl the date
+# in YYYY-MM-DD format listed for that line.
+# If no date is listed, the exception will never expire. (NOT RECOMMENDED)
+#
+# test
+# Example:
+# 40104 2022-01-15
+#
+38834 2022-03-01 # urllib3
+43975 2022-03-01 # urllib3
+27519 2022-03-01 # urllib3

requirements-test.txt

@@ -0,0 +1,3 @@
+pytest==6.2.5
+pytest-cov==3.0.0
+safety==1.10.3

requirements.txt

@@ -4,18 +4,18 @@ chardet==3.0.4
 Click==7.0
 cx-Oracle==7.0.0
 Flask==1.0.2
-Flask-Cors==3.0.6
+Flask-Cors==3.0.9
 Flask-HTTPAuth==3.2.4
 idna==2.7
 itsdangerous==0.24
-Jinja2==2.10.1
+Jinja2==2.11.3
 MarkupSafe==1.1.1
 passlib==1.7.1
 python-json-logger==0.1.9
 requests==2.22.0
 six==1.11.0
 urllib3==1.25.3
-Werkzeug==0.15.3
+Werkzeug==2.0.2
 WeasyPrint==47
 ipdb==0.12.3
 pypdftk==0.4
@@ -26,5 +26,5 @@ PyPDF2==1.26.0
 pdfkit==0.6.1
 beautifulsoup4==4.7.1
 
-gunicorn==19.9.0
+gunicorn==19.10.0
 flake8==3.6.0

sonar-project.properties

@@ -0,0 +1,19 @@
+sonar.projectKey=fecgov_fecfile-image-generator
+sonar.organization=fecgov
+
+# This is the name and version displayed in the SonarCloud UI.
+sonar.projectName=fecfile-image-generator
+#sonar.projectVersion=1.0
+
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+sonar.sources=.
+sonar.python.coverage.reportPaths=coverage.xml
+sonar.python.version=3
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8
+
+
+sonar.host.url=https://sonarcloud.io
+
+