merge latest from main

transcom · Oct 28, 2024 · 47d8173 · 47d8173
2 parents 6778e8d + d6a51b0
commit 47d8173
Show file tree

Hide file tree

Showing 799 changed files with 176,332 additions and 3,957 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ version: 2.1
 
 # References for variables shared across the file
 references:
-  circleci-docker: &circleci-docker milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d
+  circleci-docker: &circleci-docker milmove/circleci-docker:milmove-app-3d9acdaa37c81a87b5fc1c6193a8e528dd56e4ed
 
   # the playwright image to use
   playwright: &playwright cimg/node:18.13.0-browsers
@@ -277,13 +277,13 @@ commands:
       - create_dot_go_version
       - restore_cache:
           keys:
-            - go-mod-sources-v7-{{ checksum "go.sum" }}-{{ checksum ".go-version" }}
+            - go-mod-sources-v8-{{ checksum "go.sum" }}-{{ checksum ".go-version" }}
 
   save_cache_for_go:
     steps:
       - create_dot_go_version
       - save_cache:
-          key: go-mod-sources-v7-{{ checksum "go.sum" }}-{{ checksum ".go-version" }}
+          key: go-mod-sources-v8-{{ checksum "go.sum" }}-{{ checksum ".go-version" }}
           paths:
             - '~/go'
             - '~/transcom/mymove/bin/swagger'
@@ -877,6 +877,8 @@ commands:
             export FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
             export FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
             export FEATURE_FLAG_QUEUE_MANAGEMENT=false
+            export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
+            export FEATURE_FLAG_ENABLE_ALASKA=false
 
             # disable for speed, playwright tests can fail otherwise
             export DB_DEBUG=false
@@ -917,6 +919,8 @@ commands:
             FEATURE_FLAG_MANAGE_SUPPORTING_DOCS: 'false'
             FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE: 'false'
             FEATURE_FLAG_QUEUE_MANAGEMENT: 'false'
+            FEATURE_FLAG_UNACCOMPANIED_BAGGAGE: 'false'
+            FEATURE_FLAG_ENABLE_ALASKA: 'false'
           command: |
             SHARD=$((${CIRCLE_NODE_INDEX}+1))
             PLAYWRIGHT_JUNIT_OUTPUT_NAME=playwright-results.xml \
@@ -1498,7 +1502,7 @@ jobs:
             #
             # The trailing hyphen in restore_cache seems important
             # according to the page linked above
-            - v9-server-tests-coverage-
+            - v10-server-tests-coverage-
       - run:
           name: Ensure Test Coverage Increasing
           command: |
@@ -1554,7 +1558,7 @@ jobs:
             # Use the BuildNum to update the cache key so that the
             # coverage cache is always updated
             - save_cache:
-                key: v9-server-tests-coverage-{{ .BuildNum }}
+                key: v10-server-tests-coverage-{{ .BuildNum }}
                 paths:
                   - ~/transcom/mymove/tmp/baseline-go-coverage
                 when: always
@@ -1632,7 +1636,7 @@ jobs:
           # The trailing hyphen in restore_cache seems important
           # according to the page linked above
           keys:
-            - v7-client-tests-coverage-
+            - v8-client-tests-coverage-
       - run:
           name: Ensure Test Coverage Increasing
           command: |
@@ -1684,7 +1688,7 @@ jobs:
             # Use the BuildNum to update the cache key so that the
             # coverage cache is always updated
             - save_cache:
-                key: v7-client-tests-coverage-{{ .BuildNum }}
+                key: v8-client-tests-coverage-{{ .BuildNum }}
                 paths:
                   - ~/transcom/mymove/tmp/baseline-jest-coverage
                 when: always

diff --git a/.envrc b/.envrc
@@ -154,6 +154,10 @@ export FEATURE_FLAG_NTS=true
 export FEATURE_FLAG_NTSR=true
 export FEATURE_FLAG_BOAT=true
 export FEATURE_FLAG_MOBILE_HOME=true
+export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
+
+# Feature flag to allow AK to be entered as a state
+export FEATURE_FLAG_ENABLE_ALASKA=false
 
 # Feature flag to enable/disable customers needing to authenticate with CAC on registration
 # When turned to true, this will require each customer user to have the value of true in cac_validated in the service_members table
@@ -207,9 +211,9 @@ export DEVLOCAL_AUTH=true
 export DOD_CA_PACKAGE="${MYMOVE_DIR}/config/tls/milmove-cert-bundle.p7b"
 
 # MyMove client certificate
-# All of our DoD-signed certs are currently signed by DOD SW CA-66
+# All of our DoD-signed certs are currently signed by DOD SW CA-75
 # This cannot be changed unless our certs are all resigned
-MOVE_MIL_DOD_CA_CERT=$(cat "${MYMOVE_DIR}"/config/tls/dod-sw-ca-66.pem)
+MOVE_MIL_DOD_CA_CERT=$(cat "${MYMOVE_DIR}"/config/tls/dod-sw-ca-75.pem)
 require MOVE_MIL_DOD_TLS_CERT "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal move_mil_dod_tls_cert'"
 require MOVE_MIL_DOD_TLS_KEY "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal move_mil_dod_tls_key'"
 export MOVE_MIL_DOD_CA_CERT
@@ -424,4 +428,4 @@ then
 fi
 
 # Check that all required environment variables are set
-check_required_variables
+check_required_variables
diff --git a/.github/workflows/go-auto-approve.yml b/.github/workflows/go-auto-approve.yml
@@ -27,7 +27,7 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.2'
+          go-version: '1.23.1'
       - name: Tidy
         run: |
           go version

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -62,7 +62,7 @@ repos:
           )$
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.57.2
+    rev: v1.61.0
     hooks:
       - id: golangci-lint
         entry: bash -c 'exec golangci-lint run ${GOLANGCI_LINT_VERBOSE} -j=${GOLANGCI_LINT_CONCURRENCY:-1}' # custom bash so we can override concurrency for faster dev runs

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-golang 1.22.2
-nodejs 18.20.2
+golang 1.23.1
+nodejs 18.20.4
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,7 @@ COPY bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem
 COPY bin/milmove /bin/milmove
 
 COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
-COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem
+COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
 
 COPY swagger/* /swagger/
 COPY build /build

diff --git a/Dockerfile.local b/Dockerfile.local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
+FROM milmove/circleci-docker:milmove-app-3d9acdaa37c81a87b5fc1c6193a8e528dd56e4ed as builder
 
 ENV CIRCLECI=true
 
@@ -27,7 +27,7 @@ COPY --from=builder --chown=root:root /home/circleci/project/bin/rds-ca-2019-roo
 COPY --from=builder --chown=root:root /home/circleci/project/bin/milmove /bin/milmove
 
 COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
-COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem
+COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-75.pem
 
 # While it's ok to have these certs copied locally, they should never be copied into Dockerfile.
 COPY config/tls/devlocal-ca.key /config/tls/devlocal-ca.key

diff --git a/Dockerfile.migrations_local b/Dockerfile.migrations_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
+FROM milmove/circleci-docker:milmove-app-3d9acdaa37c81a87b5fc1c6193a8e528dd56e4ed as builder
 
 ENV CIRCLECI=true
 

diff --git a/Dockerfile.reviewapp b/Dockerfile.reviewapp
@@ -3,7 +3,7 @@
 ###########
 
 # Base builder so the ci build image hash is referenced once
-FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
+FROM milmove/circleci-docker:milmove-app-3d9acdaa37c81a87b5fc1c6193a8e528dd56e4ed as builder
 
 ENV CIRCLECI=docker
 ENV REACT_APP_NODE_ENV=development
@@ -56,7 +56,7 @@ COPY migrations/app/secure /migrate/secure
 COPY migrations/app/migrations_manifest.txt /migrate/migrations_manifest.txt
 
 COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
-COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem
+COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-75.pem
 
 # While it's ok to have these certs copied locally, they should never be copied into Dockerfile.
 COPY config/tls/devlocal-ca.key /config/tls/devlocal-ca.key

diff --git a/Dockerfile.tasks_local b/Dockerfile.tasks_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
+FROM milmove/circleci-docker:milmove-app-3d9acdaa37c81a87b5fc1c6193a8e528dd56e4ed as builder
 
 ENV CIRCLECI=true
 

diff --git a/Dockerfile.tools_local b/Dockerfile.tools_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
+FROM milmove/circleci-docker:milmove-app-3d9acdaa37c81a87b5fc1c6193a8e528dd56e4ed as builder
 
 ENV CIRCLECI=true
 

diff --git a/Dockerfile.webhook_client b/Dockerfile.webhook_client
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
+FROM milmove/circleci-docker:milmove-app-3d9acdaa37c81a87b5fc1c6193a8e528dd56e4ed as builder
 
 # Prepare public DOD certificates.
 # hadolint ignore=DL3002

diff --git a/Dockerfile.webhook_client_dp3 b/Dockerfile.webhook_client_dp3
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
+FROM milmove/circleci-docker:milmove-app-3d9acdaa37c81a87b5fc1c6193a8e528dd56e4ed as builder
 
 # Prepare public DOD certificates.
 # hadolint ignore=DL3002

diff --git a/Dockerfile.webhook_client_local b/Dockerfile.webhook_client_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
+FROM milmove/circleci-docker:milmove-app-3d9acdaa37c81a87b5fc1c6193a8e528dd56e4ed as builder
 
 # Prepare public DOD certificates.
 # hadolint ignore=DL3002

diff --git a/Makefile b/Makefile
@@ -414,7 +414,7 @@ build_tools: bin/gin \
 build: server_build build_tools client_build ## Build the server, tools, and client
 
 .PHONY: mocks_generate
-mocks_generate: bin/mockery ## Generate mockery mocks for tests
+mocks_generate: bin/mockery ## Generate mockery mocks for tests.
 	go generate $$(go list ./... | grep -v \\/pkg\\/gen\\/ | grep -v \\/cmd\\/)
 
 .PHONY: server_test_setup
@@ -1057,7 +1057,7 @@ pretty: gofmt ## Run code through JS and Golang formatters
 
 .PHONY: docker_circleci
 docker_circleci: ## Run CircleCI container locally with project mounted
-	docker run -it --pull=always --rm=true -v $(PWD):$(PWD) -w $(PWD) -e CIRCLECI=1 milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d bash
+	docker run -it --pull=always --rm=true -v $(PWD):$(PWD) -w $(PWD) -e CIRCLECI=1 milmove/circleci-docker:milmove-app-3d9acdaa37c81a87b5fc1c6193a8e528dd56e4ed bash
 
 .PHONY: docker_local_ssh_server_with_password
 docker_local_ssh_server_with_password: