CMSgov
diff --git a/‎.env.example‎
Lines changed: 0 additions & 2 deletions b/‎.env.example‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎.github/workflows/pull-request-checks.yml‎
Lines changed: 94 additions & 0 deletions b/‎.github/workflows/pull-request-checks.yml‎
Lines changed: 94 additions & 0 deletions
diff --git a/‎.github/workflows/unit-tests.yml‎
Lines changed: 0 additions & 30 deletions b/‎.github/workflows/unit-tests.yml‎
Lines changed: 0 additions & 30 deletions
diff --git a/‎Makefile‎
Lines changed: 7 additions & 26 deletions b/‎Makefile‎
Lines changed: 7 additions & 26 deletions
diff --git a/‎hhs_oauth_server/settings/base.py‎
Lines changed: 3 additions & 5 deletions b/‎hhs_oauth_server/settings/base.py‎
Lines changed: 3 additions & 5 deletions
diff --git a/‎hhs_oauth_server/settings/base_local.py‎
Lines changed: 4 additions & 7 deletions b/‎hhs_oauth_server/settings/base_local.py‎
Lines changed: 4 additions & 7 deletions
diff --git a/‎hhs_oauth_server/settings/logging_it.py‎
Lines changed: 0 additions & 43 deletions b/‎hhs_oauth_server/settings/logging_it.py‎
Lines changed: 0 additions & 43 deletions
diff --git a/‎ops/containers/.env.local‎
Lines changed: 0 additions & 2 deletions b/‎ops/containers/.env.local‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎ops/containers/Makefile‎
Lines changed: 28 additions & 40 deletions b/‎ops/containers/Makefile‎
Lines changed: 28 additions & 40 deletions
@@ -7,8 +7,6 @@ BB20_REMOTE_DEBUG_WAIT_ATTACH=false
 SUPER_USER_NAME=root
 SUPER_USER_PASSWORD=blue123
 SUPER_USER_EMAIL=bluebutton@example.com
-## DB image migrations
-DB_MIGRATIONS=true
 ## put a place holder Django secret
 DJANGO_SECRET_KEY=replace-me-with-real-secret
 # This value controls if some unit tests run that require being online. 
 
@@ -0,0 +1,94 @@
+name: Pull Request Checks
+
+on:
+  pull_request:
+    branches: [master]
+    paths-ignore:
+      - 'docs/**'
+      - '*.md'
+  workflow_dispatch:
+
+jobs:
+  ruff:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install python dependencies
+        run: |
+          python3 -m venv venv
+          source venv/bin/activate
+          python3 -m pip install --upgrade pip setuptools wheel
+          pip install -r requirements/requirements.dev.txt --no-deps --prefer-binary --require-hashes
+
+      - name: Run Ruff Linter
+        run: |
+          source venv/bin/activate
+          ruff check
+
+  unit-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install python dependencies
+        run: |
+          python3 -m venv venv
+          source venv/bin/activate
+          python3 -m pip install --upgrade pip setuptools wheel
+          pip install -r requirements/requirements.dev.txt --no-deps --prefer-binary --require-hashes
+
+      - name: Run Unit Tests
+        run: |
+          source venv/bin/activate
+          pytest -m 'not integration'
+
+  integration-tests:
+    needs: [ruff, unit-tests]
+    env:
+      AWS_REGION: us-east-1
+
+    permissions:
+      id-token: write
+      contents: read
+
+    # This will only run on test
+    runs-on: codebuild-bb-test-web-server-${{ github.run_id }}-${{ github.run_attempt }}
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Setup AWS credentials
+        uses: ./.github/actions/setup-tofu
+        with:
+          environment: test
+          non-prod-account: ${{ secrets.NON_PROD_ACCOUNT }}
+          prod-account: ${{ secrets.PROD_ACCOUNT }}
+          test-role-id: ${{ secrets.TEST_AWS_ROLE_ID_MASK }}
+          prod-role-id: ${{ secrets.PROD_AWS_ROLE_ID_MASK }}
+
+      - name: Build BBAPI
+        run: |
+          cd ./ops/containers/bb-api
+          make build-codebuild
+
+      - name: Start Stack
+        run: |
+          cd ./ops/containers/bb-api
+          make run-codebuild
+
+      - name: Execute Integration Tests
+        run: |
+          cd ./ops/containers/bb-api
+          make run-codebuild-integration
+
+      - name: Teardown Stack
+        if: always()
+        run: |
+          cd ./ops/containers/bb-api
+          make teardown-codebuild
@@ -1,20 +1,10 @@
-build-local:
-	cd ops/containers ; make build-local ; cd ../..
+.PHONY: build-local build-local-no-cache run-local build-selenium \
+        run-selenium-local reqs-install reqs-install-dev generate \
+        generate-requirements migrate collectstatic \
+        unit-test integration-test
 
-build-local-no-cache:
-	cd ops/containers ; make build-local-no-cache ; cd ../..
-
-run-local:
-	cd ops/containers ; make run-local ; cd ../..
-
-exec-web:
-	cd ops/containers ; make exec-web ; cd ../..
-
-build-selenium:
-	cd ops/containers ; make build-selenium ; cd ../..
-
-run-selenium:
-	$(MAKE) -C ops/containers run-selenium-target-local
+build-local build-local-no-cache run-local build-selenium migrate collectstatic run-selenium-local:
+	$(MAKE) -C ops/containers $@
 
 reqs-install:
 	pip install -r requirements/requirements.txt
@@ -23,16 +13,7 @@ reqs-install-dev:
 	pip install -r requirements/requirements.dev.txt
 
 generate generate-requirements:
-	cd ops/containers ; make requirements ; cd ../..
-
-retrieve-certs:
-	cd ops/containers ; make retrieve-certs ; cd ../..
-
-migrate:
-	cd ops/containers ;  make migrate ; cd ../..
-
-collectstatic:
-	cd ops/containers ; make collectstatic ; cd ../..
+	$(MAKE) -C ops/containers requirements
 
 unit-test:
 	pytest -m 'not integration'
 
@@ -9,11 +9,9 @@
     TARGET_ENV=(str, ''),
 )
 
-environ.Env.read_env(os.path.join(BASE_DIR + '/ops/containers', '.env.local'))
-
 TARGET_ENV = env('TARGET_ENV')
 
-if TARGET_ENV == 'local':
-    from hhs_oauth_server.settings.base_local import *  # noqa
+if TARGET_ENV == 'local' or TARGET_ENV == 'codebuild':
+    from hhs_oauth_server.settings.base_local import *
 else:
-    from hhs_oauth_server.settings.base_ec2 import *  # noqa
+    from hhs_oauth_server.settings.base_ec2 import *
@@ -16,7 +16,9 @@
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 # Take environment variables from .env.local file
-environ.Env.read_env(os.path.join(BASE_DIR + '/ops/container', '.env.local'))
+TARGET_ENV = env('TARGET_ENV')
+
+environ.Env.read_env(os.path.join(BASE_DIR + '/ops/container', f'.env.{TARGET_ENV}'))
 
 ###############################################################################
 # DJANGO BASE SETTINGS
@@ -262,12 +264,7 @@
     },
 }
 
-DATABASES = {
-    'default': env.db(
-        'DATABASES_CUSTOM',
-        default=f'sqlite:///{BASE_DIR}/db.sqlite3',
-    )
-}
+DATABASES = {'default': env.db('DATABASES_CUSTOM', default='sqlite:////tmp/db.sqlite3')}  # type: ignore
 
 # internationalization
 LANGUAGE_CODE = 'en'
 
@@ -27,8 +27,6 @@ AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN}
 SUPER_USER_NAME=root
 SUPER_USER_PASSWORD=blue123
 SUPER_USER_EMAIL=bluebutton@example.com
-# We run migrations *always* when running locally
-DB_MIGRATIONS=true
 # This would be cryptographically secure in production.
 DJANGO_SECRET_KEY=replace-me-with-real-secret
 
 
@@ -1,64 +1,52 @@
-SHELL:=/bin/bash
-RELEASE_TAG?=TAG_NOT_SET
-bfd ?= "test"
-env ?= "local"
-auth ?= "live"
+SHELL       := /bin/bash
+RELEASE_TAG ?= TAG_NOT_SET
+bfd         ?= test
+env         ?= local
+auth        ?= live
+
+.PHONY: css requirements build-local build-local-no-cache build-production run-local \
+		migrate collectstatic run-selenium-local build-selenium
 
 css:
-	cd bb-css ; make build-local
-	cd bb-css ; make run-local
+	$(MAKE) -C bb-css build-local run-local
 
 requirements:
-	cd bb-requirements ; make clean
-	cd bb-requirements ; make build-local
-	cd bb-requirements ; make run-local
+	$(MAKE) -C bb-requirements clean build-local run-local
 
 build-local: css requirements
-	cd mslsx ; make build-local
-	cd bb-api ; make build-local
+	$(MAKE) -C mslsx build-local
+	$(MAKE) -C bb-api build-local
 
 build-local-no-cache:
-	cd bb-api ; make build-local-no-cache
+	$(MAKE) -C bb-api build-local-no-cache
 
 # This is speculative; not yet tested in production.
 build-production:
-	echo "build"
-	env="local" \
-	bfd=${bfd} \
-	docker build \
-	--platform "linux/amd64" \
-	--build-arg RELEASE_TAG="${RELEASE_TAG}" \
-	--build-arg BUILD_TARGET="production" \
-	--no-cache \
-	-t bb:latest \
-	-f bb-api/Dockerfile \
-	.
+	@echo "Building production..."
+	env="local" bfd="$(bfd)" docker build \
+		--platform "linux/amd64" \
+		--build-arg RELEASE_TAG="$(RELEASE_TAG)" \
+		--build-arg BUILD_TARGET="production" \
+		--no-cache \
+		-t bb:latest \
+		-f bb-api/Dockerfile .
 
 run-local:
-	bfd="${bfd}" \
-	env="${env}" \
-	auth="${auth}" \
-	TARGET_ENV="local" \
+	bfd="$(bfd)" env="$(env)" auth="$(auth)" TARGET_ENV="local" \
 	bash ./bb-api/scripts/external/prepare-environment.bash
 
 migrate:
-	MIGRATE=1 \
-	bfd="test" \
-	env="local" \
-	TARGET_ENV="local" \
+	MIGRATE=1 bfd="test" env="local" TARGET_ENV="local" \
 	bash ./bb-api/scripts/external/prepare-environment.bash
 
 collectstatic:
-	COLLECTSTATIC=1 \
-	bfd="test" \
-	env="local" \
-	TARGET_ENV="local" \
+	COLLECTSTATIC=1 bfd="test" env="local" TARGET_ENV="local" \
 	bash ./bb-api/scripts/external/prepare-environment.bash
 
-run-selenium-target-local:
+run-selenium-local:
 	@echo "Running Selenium: Local"
-	$(MAKE) -C selenium run-selenium-target-local AUTH=$(auth)
+	$(MAKE) -C selenium run-selenium-local AUTH="$(auth)" DEBUG="$(debug)"
 
 build-selenium:
-	@echo "Running Selenium: Local"
-	cd selenium && make build-selenium
+	@echo "Building Selenium..."
+	$(MAKE) -C selenium build-selenium