Merge branch 'master' of https://github.com/CMSgov/bluebutton-web-server into feature/c4dic

Author: jimmyfagan

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,5 +13,5 @@ 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
         """

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,4 +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/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)

apps/accounts/templates/account-settings.html

@@ -1,5 +1,6 @@
 {% extends "oauth2_provider/base.html" %}
 {% load i18n %}
+{% load bootstrap5 %}
 
 {% block bannerBackButton %}
   <a class="banner-back-button" href="/" style="outline-color: transparent; background-color: transparent"><i data-feather="arrow-left"></i>Back to Dashboard</a>
@@ -43,10 +44,7 @@ <h4 class="ds-h4">{%trans "Important" %}</h4>
 
           <form class="well ds-u-margin-y--2" method="post" action="" enctype="multipart/form-data">
             {% csrf_token %}
-    
-            {% load bootstrap %}
-            {{ form|bootstrap }}
-    
+            {% bootstrap_form form %}
             <input type="submit" class="ds-c-button ds-c-button--solid ds-u-margin-y--2" value="{% trans 'Update Information' %}" /><br>
           </form>
 

apps/accounts/templates/registration/login.html

@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load bootstrap5 %}
 
 <!-- Ignore Banner Code -->
 {% block banner %}{% endblock %}
@@ -14,7 +15,7 @@
 		<h1>Sandbox Login</h1>
 		<p>Register applications, make sample API calls, manage tokens, and more.</p>
 
-                {% include "include/messages-new-fmt.html" %}
+		{% include "include/messages-new-fmt.html" %}
 
 		<!-- Content Card -->
 		<div class="gradient-content-card">
@@ -23,8 +24,7 @@ <h1>Sandbox Login</h1>
 				<form class="" method="post" action="">
 					{% csrf_token %}
 					<table>
-						{% load bootstrap %}
-						{{ form|bootstrap }}
+						{% bootstrap_form form %}
 					</table>
 					<input type="submit" class="ds-c-button ds-u-margin-y--2 ds-c-button--solid" value="Login" />
 				</form>