Staging -> Master

.circleci/config.yml

@@ -1,60 +1,46 @@
-version: 2.0
+version: 2.1
 
 default-python-node: &default-python-node
-  image: circleci/python:3.6.1
+  image: circleci/python:3.6.8
   environment:
-    CC_TEST_REPORTER_ID: 61cf394238222f3d820e702a4679e5bac871cf7fd9395ee614d3d4e4afcd5a4f
+    CC_TEST_REPORTER_ID: b267008efa014a2c3a1ed266efebeb68bad762a948a54a443b4de581a92c45b0
     COMPOSE_FILE_NAME: circleci-docker-compose.yml
-default-postgres-node: &default-postgres-node
-  image: circleci/postgres:9.6.2
-  environment:
-    POSTGRES_USER: root
-    POSTGRES_DB: circle_test
+    DJANGO_SECRET_KEY: ci_secret_key
+default-oracle-node: &default-oracle-node
+  image: mjoyce91/oracle193db:fast
 jobs:
   build:
     docker:
       - *default-python-node
-      - *default-postgres-node
+      - *default-oracle-node
     steps:
       - checkout
+      - setup_remote_docker
       - restore_cache:
-          key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
+          key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
       - run:
           command: |
             python3 -m venv venv
             . venv/bin/activate
             pip install -r requirements.txt
+            pip install -r requirements-no-deps.txt --no-dependencies
       - save_cache:
-          key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
+          key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
           paths:
             - "venv"
-  docker-build:
-    docker:
-      - *default-python-node
-    steps:
-      - setup_remote_docker
-      - checkout
-      - run:
-          name: Docker Build
-          command: |
-            TAG=$CIRCLE_BRANCH-$CIRCLE_SHA1
-            IMAGE_NAME="talentmap/${CIRCLE_PROJECT_REPONAME}:${TAG}"
-            LOWERCASE_IMAGE_NAME=$(echo "$IMAGE_NAME" | awk '{print tolower($0)}')
-            docker login -u $DOCKER_USER -p $DOCKER_PASS
-            docker build -t $LOWERCASE_IMAGE_NAME .
-            docker push $LOWERCASE_IMAGE_NAME
   bandit:
     docker:
       - *default-python-node
     steps:
       - checkout
       - restore_cache:
-          key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
+          key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
       - run:
           command: |
             python3 -m venv venv
             . venv/bin/activate
             pip install -r requirements.txt
+            pip install -r requirements-no-deps.txt --no-dependencies
       - run:
           command: |
             . venv/bin/activate
@@ -65,45 +51,113 @@ jobs:
   pytest:
     docker:
       - *default-python-node
-      - *default-postgres-node
+      - *default-oracle-node
     steps:
       - checkout
+      - setup_remote_docker
       - run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
       - run: chmod +x ./cc-test-reporter
+      - run: chmod +x ./wait-for-oracle.sh
       - run: ./cc-test-reporter before-build
       - restore_cache:
-          key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
+          key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
       - run:
+          name: pip install
           command: |
             python3 -m venv venv
             . venv/bin/activate
             pip install -r requirements.txt
+            pip install -r requirements-no-deps.txt --no-dependencies
+      - run:
+          name: Install SQLPlus
+          command: |
+            cd /opt
+            sudo mkdir oracle
+            cd ./oracle
+            sudo apt-get update && sudo apt-get install -y libaio1 wget unzip
+            sudo wget https://download.oracle.com/otn_software/linux/instantclient/19800/instantclient-basiclite-linux.x64-19.8.0.0.0dbru.zip
+            sudo wget https://download.oracle.com/otn_software/linux/instantclient/19800/instantclient-sqlplus-linux.x64-19.8.0.0.0dbru.zip
+            sudo wget https://download.oracle.com/otn_software/linux/instantclient/19800/instantclient-sdk-linux.x64-19.8.0.0.0dbru.zip
+            sudo unzip instantclient-basiclite-linux.x64-19.8.0.0.0dbru.zip
+            sudo unzip instantclient-sqlplus-linux.x64-19.8.0.0.0dbru.zip
+            sudo unzip instantclient-sdk-linux.x64-19.8.0.0.0dbru.zip
+            sudo rm -f instantclient-basiclite-linux.x64-19.8.0.0.0dbru.zip
+            sudo rm -f instantclient-sqlplus-linux.x64-19.8.0.0.0dbru.zip
+            sudo rm -f instantclient-sdk-linux.x64-19.8.0.0.0dbru.zip
+            cd /opt/oracle/instantclient*
+            sudo rm -f *jdbc* *occi* *mysql* *README *jar uidrvci genezi adrci
+            cd /etc/ld.so.conf.d
+            sudo touch oracle-instantclient.conf
+            sudo tee oracle-instantclient.conf \<<<"/opt/oracle/instantclient_19_8"
+            cd /opt/oracle/instantclient*
+            sudo ldconfig
+      - run:
+          name: Create Oracle user
+          command: |
+            ./wait-for-oracle.sh 127.0.0.1:1521/oraclesid sys oraclepwd 'as sysdba'
+            ./create-oracle-user.sh 127.0.0.1:1521/oraclesid sys oraclepwd 'as sysdba'
+      - run:
+          name: Wait for Oracle
+          command: |
+            ./wait-for-oracle.sh 127.0.0.1:1521/oraclepdb talentmap1 talentmap1 "" true
       - run:
           name: Python Test Coverage
           command: |
             . venv/bin/activate
             pytest --cov=. --cov-report xml:./coverage.xml
           environment:
-            DATABASE_URL: postgresql://root:@127.0.0.1:5432/circle_test
+            # DATABASE_URL: postgresql://root:@127.0.0.1:5432/circle_test
+            DATABASE_URL: 127.0.0.1:1521/oraclepdb
+            DATABASE_USER: talentmap1
+            DATABASE_PW: talentmap1
+            DJANGO_LOG_DIRECTORY: ./
       - run: ./cc-test-reporter after-build -t coverage.py --exit-code $?
       - store_artifacts:
           path: coverage.xml
           destination: pytest-cov/coverage.xml
-  zap:
+  dependencies:
+    docker:
+      - *default-python-node
+    steps:
+      - checkout
+      - restore_cache:
+          key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
+      - run:
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            mkdir ./tmp-pip
+            pip install -r requirements.txt -t ./tmp-pip
+            pip install -r requirements-no-deps.txt --no-dependencies -t ./tmp-pip
+            cd ./tmp-pip
+            zip -r ../talentmap-api-dependencies.zip * .[^.]*
+      - store_artifacts:
+          path: talentmap-api-dependencies.zip
+          destination: talentmap-api-dependencies.zip
+  pylint:
     docker:
       - *default-python-node
     steps:
-      - setup_remote_docker
       - checkout
-      - run: chmod +x wait-for-postgres.sh
+      - restore_cache:
+          key: deps2-{{ .Branch }}-{{ checksum "requirements.txt" }}
       - run:
-          name: Replace placeholders in Compose file
           command: |
-            TAG=$CIRCLE_BRANCH-$CIRCLE_SHA1
-            LOWERCASE_TAG=$(echo "$TAG" | awk '{print tolower($0)}')
-            LOWERCASE_REPO_NAME=$(echo "$CIRCLE_PROJECT_REPONAME" | awk '{print tolower($0)}')
-            sed -i "s#@@REPO_NAME@@#${LOWERCASE_REPO_NAME}#g" $COMPOSE_FILE_NAME
-            sed -i "s#@@LABEL@@#${LOWERCASE_TAG}#g" $COMPOSE_FILE_NAME
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install -r requirements.txt
+            pip install -r requirements-no-deps.txt --no-dependencies
+      - run:
+          name: pylint
+          command: |
+            . venv/bin/activate
+            pylint ./talentmap_api/ --rcfile=./.pylintrc --output-format=text || pylint-exit --error-fail $?
+  zap:
+    docker:
+      - *default-python-node
+    steps:
+      - checkout
+      - run: chmod +x wait-for-oracle.sh
       - run:
           name: Initialize Dummy Data Container
           command: |
@@ -114,7 +168,7 @@ jobs:
           command: |
             docker-compose -f $COMPOSE_FILE_NAME \
               run app bash -c \
-              "./wait-for-postgres.sh db && python manage.py migrate"
+              "./wait-for-oracle.sh oracle && python manage.py migrate"
       - run:
           name: Start Server
           command: docker-compose -f $COMPOSE_FILE_NAME up -d
@@ -134,47 +188,23 @@ jobs:
       - store_artifacts:
           path: zap_results.md
           destination: zap/zap_results.md
-  push-stable:
-    docker:
-      - *default-python-node
-    steps:
-      - setup_remote_docker
-      - run:
-          name:
-          command: |
-            TAG=$CIRCLE_BRANCH-$CIRCLE_SHA1
-            LOWERCASE_TAG=$(echo "$TAG" | awk '{print tolower($0)}')
-            LOWERCASE_REPO_NAME=$(echo "$CIRCLE_PROJECT_REPONAME" | awk '{print tolower($0)}')
-            LOWERCASE_BRANCH_NAME=$(echo "$CIRCLE_BRANCH" | awk '{print tolower($0)}')
-            docker login -u $DOCKER_USER -p $DOCKER_PASS
-            docker pull talentmap/$LOWERCASE_REPO_NAME:$LOWERCASE_TAG
-            docker tag talentmap/$LOWERCASE_REPO_NAME:$LOWERCASE_TAG talentmap/$LOWERCASE_REPO_NAME:$LOWERCASE_BRANCH_NAME
-            docker push talentmap/$LOWERCASE_REPO_NAME:$LOWERCASE_BRANCH_NAME
 workflows:
-  version: 2
   build_and_test:
     jobs:
       - build
-      - docker-build:
-          requires:
-            - build
+      - pylint
       - bandit:
           requires:
             - build
       - pytest:
           requires:
             - build
-      - zap:
+      - dependencies:
           requires:
-            - docker-build
+            - build
+      - zap:
           filters:
             tags:
               only: /^zap.*/
             branches:
               ignore: /.*/
-      - push-stable:
-          requires:
-            - docker-build
-            - pytest
-            - bandit
-            - zap

.codeclimate.yml

@@ -33,3 +33,4 @@ exclude_paths:
   - "**/migrations/"
   - "**/saml2/*"
   - "**/commands/*"  # Management commands may have odd structures (due to lots of conditionals checking options)
+  - "**/cache/*"  # Cache bit constructors require many parameters

.coveragerc

@@ -1,2 +1,2 @@
 [run]
-omit = *apps.py, *wsgi.py, manage.py, **/settings.py, */venv/*, **/soap_api_test.py
+omit = *apps.py, *wsgi.py, manage.py, show_logo.py, **/settings.py, */venv/*, */tests/mommy_recipes.py, **/soap_api_test.py, */saml2/*, **/locustfile.py, */common/renderers.py

.github/pull_request_template.md

@@ -0,0 +1,3 @@
+Dual Merge: 
+- [FE PR](linkToFrontEndPR)
+- [Mock PR](linkToMockPR)

.github/weekly-digest.yml

@@ -0,0 +1,7 @@
+# Configuration for weekly-digest - https://github.com/apps/weekly-digest
+publishDay: sun
+canPublishIssues: true
+canPublishPullRequests: true
+canPublishContributors: true
+canPublishStargazers: true
+canPublishCommits: true

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ dev ]
+  schedule:
+    - cron: '38 14 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.gitignore

@@ -10,6 +10,7 @@ __pycache__/
 .Python
 env/
 build/
+coverage.html/
 develop-eggs/
 dist/
 downloads/
@@ -45,6 +46,8 @@ nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
+.pytest/
+.pytest_cache/
 
 # Translations
 *.mo
@@ -94,6 +97,9 @@ ENV/
 # Rope project settings
 .ropeproject
 
+# VSCode
+.vscode
+
 # mkdocs documentation
 /site
 
@@ -105,7 +111,17 @@ missing_coverage.sh
 # MacOS
 .DS_Store
 
+# PyCharm
+.idea/
+
 #Environment setup script
 setup_environment.sh
 
 talentmap_api/saml2/remote_metadata/remote_metadata.xml
+
+#Test_Data
+talentmap_api/data/test_data/real/
+obc_consolidated.csv
+cwallet.sso
+sqlnet.ora
+tnsnames.ora