sync master.

Author: JFU-NAVA-PBC

.github/pull_request_template.md

@@ -7,31 +7,15 @@ This PR template is here to help ensure you're setup for success:
 **JIRA Ticket:**
 [BB2-XXXX](https://jira.cms.gov/browse/BB2-XXXX)
 
-**User Story or Bug Summary:**
-<!-- Please copy-paste the brief user story or bug description that this PR is intended to address. -->
-
-
 ### What Does This PR Do?
 
 <!--
 Add detailed description & discussion of changes here.
-The contents of this section should be used as your commit message (unless you merge the PR via a merge commit, of course).
-
-Please follow standard Git commit message guidelines:
-* First line should be a capitalized, short (50 chars or less) summary.
-* The rest of the message should be in standard Markdown format, wrapped to 72 characters.
-* Describe your changes in imperative mood, e.g. "make xyzzy do frotz" instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy to do frotz", as if you are giving orders to the codebase to change its behavior.
-* List all relevant Jira issue keys, one per line at the end of the message, per: <https://confluence.atlassian.com/jirasoftwarecloud/processing-issues-with-smart-commits-788960027.html>.
-
-Reference: <https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project>.
 -->
 
-
 ### What Should Reviewers Watch For?
 
 <!--
-Add some items to the following list, or remove the entire section if it doesn't apply for some reason.
-
 Common items include:
 * Is this likely to address the goals expressed in the user story?
 * Are any additional documentation updates needed?
@@ -41,73 +25,36 @@ Common items include:
 * Can you find any bugs if you run the code locally and test it manually?
 -->
 
-If you're reviewing this PR, please check these things, in particular:
+If you're reviewing this PR, please check for these things in particular:
+<!-- Add some items here -->
 
-* TODO
+### Validation
 
+<!--
+Have you fully verified and tested these changes? Is the acceptance criteria met? Please provide reproducible testing instructions, code snippets, or screenshots as applicable.
+-->
 
 ### What Security Implications Does This PR Have?
 
-Submitters should complete the following questionnaire:
-
-* If the answer to any of the questions below is **Yes**, then here's a link to the associated Security Impact Assessment (SIA), security checklist, or other similar document in Confluence: N/A.
-    * Does this PR add any new software dependencies? **Yes** or **No**.
-    * Does this PR modify or invalidate any of our security controls? **Yes** or **No**.
-    * Does this PR store or transmit data that was not stored or transmitted before? **Yes** or **No**.
-* If the answer to any of the questions below is **Yes**, then please add a Security Engineer and ISSO  as a reviewer, and note that this PR should not be merged unless/until he also approves it.
-    * Do you think this PR requires additional review of its security implications for other reasons? **Yes** or **No**.
+Please indicate if this PR does any of the following:
 
+* Adds any new software dependencies
+* Modifies any security controls
+* Adds new transmission or storage of data
+* Any other changes that could possibly affect security?
 
-### What Needs to Be Merged and Deployed Before this PR?
+- [ ] Yes, one or more of the above security implications apply. This PR must not be merged without the ISSO or team
+  security engineer's approval.
 
-<!--
-Add some items to the following list, or remove the entire section if it doesn't apply.
-
-Common items include:
-* Database migrations (which should always be deployed by themselves, to reduce risk).
-* New features in external dependencies (e.g. BFD).
--->
-
-This PR cannot be either merged or deployed until the following pre-requisite changes have been fully deployed:
-
-* CMSgov/some_repo#42
-  
 ### Any Migrations?
 
 <!--
 Make sure to work with whoever is doing the deploy so they are aware of any migrations that may need to be run
 -->
 
 * [ ] Yes, there are migrations
-  * [ ] The migrations should be run PRIOR to the code being deployed
-  * [ ] The migrations should be run AFTER the code is deployed
-  * [ ] There is a more complicated migration plan (downtime, etc) <!-- Make sure to include the details of the plan below -->
+    * [ ] The migrations should be run PRIOR to the code being deployed
+    * [ ] The migrations should be run AFTER the code is deployed
+    * [ ] There is a more complicated migration plan (downtime,
+      etc) <!-- Make sure to include the details of the plan below -->
 * [ ] No migrations
-
-
-### Submitter Checklist
-
-<!--
-Helpful hint: if needed, Git allows you to edit your PR's commits and history, prior to merge.
-See these resources for more information:
-
-* <https://dev.to/maxwell_dev/the-git-rebase-introduction-i-wish-id-had>
-* <https://raphaelfabeni.com/git-editing-commits-part-1/>
--->
-
-I have gone through and verified that...:
-
-* [ ] This PR is reasonably limited in scope, to help ensure that:
-    1. It doesn't unnecessarily tie a bunch of disparate features, fixes, refactorings, etc. together.
-    2. There isn't too much of a burden on reviewers.
-    3. Any problems it causes have a small "blast radius".
-    4. It'll be easier to rollback if that becomes necessary.
-* [ ] I have named this PR and its branch such that they'll be automatically be linked to the (most) relevant Jira issue, per: <https://confluence.atlassian.com/adminjiracloud/integrating-with-development-tools-776636216.html>.
-* [ ] This PR includes any required documentation changes, including `README` updates and changelog / release notes entries.
-* [ ] All new and modified code is appropriately commented, such that the what and why of its design would be reasonably clear to engineers, preferably ones unfamiliar with the project.
-* [ ] All tech debt and/or shortcomings introduced by this PR are detailed in `TODO` and/or `FIXME` comments, which include a JIRA ticket ID for any items that require urgent attention.
-* [ ] Reviews are requested from both:
-    * At least two other engineers on this project, at least one of whom is a senior engineer or owns the relevant component(s) here.
-    * Any relevant engineers on other projects (e.g. BFD, SLS, etc.).
-* [ ] Any deviations from the other policies in the [DASG Engineering Standards](https://github.com/CMSgov/cms-oeda-dasg/blob/master/policies/engineering_standards.md) are specifically called out in this PR, above.
-    * Please review the standards every few months to ensure you're familiar with them.

Dockerfile

@@ -1,5 +1,6 @@
-FROM --platform=linux/amd64 python:3.8
+FROM --platform=linux/amd64 python:3.11
 ENV PYTHONUNBUFFERED 1
+ENV PYDEVD_DISABLE_FILE_VALIDATION 1
 RUN useradd -m -s /bin/bash DEV
 USER DEV
 ADD . /code

Dockerfile.selenium

@@ -2,7 +2,7 @@ FROM seleniarm/standalone-chromium
 
 ENV PYTHONUNBUFFERED 1
 USER root
-RUN apt-get update ; apt-get install -yq git curl libpq-dev libffi-dev
+#RUN apt-get update ; apt-get install -yq git curl libpq-dev libffi-dev
 RUN apt-get update ; apt-get install -yq python3 python3-venv
 RUN ln -s /usr/bin/python3 /usr/local/bin/python
 RUN useradd -m -s /bin/bash DEV
@@ -13,4 +13,4 @@ RUN python -m venv /tmp/venv
 RUN . /tmp/venv/bin/activate
 ENV PATH="/tmp/venv/bin:${PATH}"
 RUN pip3 install --upgrade pip
-RUN pip3 install selenium pytest jsonschema
+RUN pip3 install selenium pytest debugpy jsonschema python-dateutil

Dockerfiles/Dockerfile.selenium-jenkins-python311

@@ -0,0 +1,18 @@
+FROM --platform=linux/amd64 python:3.11
+# For build CBC Jenkins job ECR image
+ENV PYTHONUNBUFFERED 1
+
+RUN mkdir /code
+ADD . /code/
+WORKDIR /code
+
+RUN pip install --upgrade pip
+RUN apt-get update && apt-get install -yq git unzip curl
+# Install Chrome for Selenium
+RUN curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /chrome.deb \
+    && dpkg -i /chrome.deb || apt-get install -yf \
+    && rm /chrome.deb
+# Install chromedriver for Selenium
+RUN wget -O /tmp/chromedriver.zip http://chromedriver.storage.googleapis.com/`curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE`/chromedriver_linux64.zip \
+    && unzip /tmp/chromedriver.zip chromedriver -d /usr/local/bin/ \
+    && chmod +x /usr/local/bin/chromedriver

Jenkinsfiles/Jenkinsfile.cbc-run-multi-pr-checks-w-selenium

@@ -1,13 +1,13 @@
 pipeline {
   agent {
     kubernetes {
-      defaultContainer "bb2-cbc-build-selenium-python38"
-      yamlFile "Jenkinsfiles/cbc-pod-deployment-config-w-selenium-p38.yaml"
+      defaultContainer "bb2-cbc-build-selenium-python311"
+      yamlFile "Jenkinsfiles/cbc-pod-deployment-config-w-selenium-p311.yaml"
     }
   }
 
   environment {
-    USE_MSLSX = false
+    USE_MSLSX = true
     DJANGO_LOG_JSON_FORMAT_PRETTY = true
     DJANGO_SETTINGS_MODULE = "hhs_oauth_server.settings.logging_it"
     OAUTHLIB_INSECURE_TRANSPORT = true
@@ -55,6 +55,7 @@ pipeline {
         sh """
           python -m venv venv
           . venv/bin/activate
+          python -m pip install --upgrade pip setuptools wheel cryptography
           make reqs-download
           make reqs-install-dev
           pip install --upgrade coverage

Jenkinsfiles/cbc-pod-deployment-config-w-selenium-p311.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Pod
+spec:
+  containers:
+    - name: bb2-cbc-build-selenium-python311
+      image: "public.ecr.aws/f5g8o1y9/bb2-cbc-build-selenium-python311:latest"
+      tty: true
+      command: ["tail", "-f"]
+      imagePullPolicy: Always
+  nodeSelector:
+      Agents: true

Makefile

@@ -4,11 +4,11 @@ reqs-compile:
 
 # Note: requirements.dev.txt includes packages from requirements.txt also.
 reqs-download:
-	pip download -r requirements/requirements.dev.txt --dest vendor --platform manylinux2014_x86_64 --abi cp38 --no-deps
+	pip download -r requirements/requirements.dev.txt --dest vendor --platform manylinux2014_x86_64 --abi cp311 --no-deps
 
 #Note: Only installs prod requirements NOT RECOMMENDED FOR DEVELOPMENT.
 reqs-download-prod:
-	pip download -r requirements/requirements.txt --dest vendor --platform manylinux2014_x86_64 --abi cp38 --no-deps	
+	pip download -r requirements/requirements.txt --dest vendor --platform manylinux2014_x86_64 --abi cp311 --no-deps
 
 reqs-install:
 	pip install -r requirements/requirements.txt --no-index --find-links ./vendor/

README.md

@@ -167,5 +167,4 @@ by their respective authors.
 License
 -------
 
-This project is free and open source software under the Apache 2 license. See LICENSE for more information.
-
+This project is free and open source software under the Apache 2 license. See LICENSE for more information.

apps/accounts/forms.py

@@ -20,7 +20,14 @@ class SignupForm(UserCreationForm):
         max_length=100, label=_("Organization Name"), required=True
     )
     password1 = forms.CharField(
-        widget=forms.PasswordInput, max_length=120, label=_("Password")
+        widget=forms.PasswordInput,
+        max_length=120,
+        label=_("Password"),
+        help_text="<span style='color:#323a45'>Password must contain at least:</br>"
+                  "<span>&#8226;</span> One upper case letter</br>"
+                  "<span>&#8226;</span> One lower case letter</br>"
+                  "<span>&#8226;</span> One special character</br>"
+                  "<span>&#8226;</span> 8 characters</style>"
     )
     password2 = forms.CharField(
         widget=forms.PasswordInput, max_length=120, label=_("Password (again)")

apps/accounts/management/commands/create_super_user_from_envars.py

@@ -1,8 +1,7 @@
 import logging
-
+import os
 import apps.logging.request_logger as bb2logging
 
-from getenv import env
 from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand
 
@@ -30,9 +29,9 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
 
         # get variables
-        super_username = env("DJANGO_SUPERUSER_USERNAME", "")
-        super_password = env("DJANGO_SUPERUSER_PASSWORD", "")
-        super_email = env("DJANGO_SUPERUSER_EMAIL", "")
+        super_username = os.environ.get("DJANGO_SUPERUSER_USERNAME", "")
+        super_password = os.environ.get("DJANGO_SUPERUSER_PASSWORD", "")
+        super_email = os.environ.get("DJANGO_SUPERUSER_EMAIL", "")
         if super_username and super_password and super_email:
             # create a super user
             r = create_superuser(super_username, super_password, super_email)