B 22015

.circleci/config.yml

@@ -53,7 +53,7 @@ references:
   # set integration-mtls-ignore-branch to the branch if you want to
   # IGNORE mtls integration tests, or `placeholder_branch_name` if you
   # do want to run them
-  integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name
+  integration-mtls-ignore-branch: &integration-mtls-ignore-branch integrationTesting
 
   # set client-ignore-branch to the branch if you want to IGNORE
   # client tests, or `placeholder_branch_name` if you do want to run
@@ -897,8 +897,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
+            export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
             export FEATURE_FLAG_ENABLE_HAWAII=false
             export FEATURE_FLAG_BULK_ASSIGNMENT=false
 
@@ -1546,7 +1546,7 @@ jobs:
             #
             # The trailing hyphen in restore_cache seems important
             # according to the page linked above
-            - v11-server-tests-coverage-
+            - v1-server-tests-coverage-integration
       - run:
           name: Ensure Test Coverage Increasing
           command: |
@@ -1585,7 +1585,7 @@ jobs:
       - when:
           condition:
             and:
-              - equal: [main, << pipeline.git.branch >>]
+              - equal: [integrationTesting, << pipeline.git.branch >>]
               - when: always
           steps:
             - run:
@@ -1602,7 +1602,7 @@ jobs:
             # Use the BuildNum to update the cache key so that the
             # coverage cache is always updated
             - save_cache:
-                key: v11-server-tests-coverage-{{ .BuildNum }}
+                key: v1-server-tests-coverage-integration{{ .BuildNum }}
                 paths:
                   - ~/transcom/mymove/tmp/baseline-go-coverage
                 when: always
@@ -1664,8 +1664,12 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - restore_cache:
-          #
+      - when:
+          condition:
+            equal: [integrationTesting, << pipeline.git.branch >>]
+          steps:
+            - restore_cache:
+            #
           # https://circleci.com/docs/caching/#restoring-cache
           #
           # restore the latest version of the test coverage in the
@@ -1682,8 +1686,8 @@ jobs:
           #
           # The trailing hyphen in restore_cache seems important
           # according to the page linked above
-          keys:
-            - v8-client-tests-coverage-
+               keys:
+               - v1-client-tests-coverage-integration
       - run:
           name: Ensure Test Coverage Increasing
           command: |
@@ -1720,7 +1724,7 @@ jobs:
       - when:
           condition:
             and:
-              - equal: [main, << pipeline.git.branch >>]
+              - equal: [integrationTesting, << pipeline.git.branch >>]
           steps:
             - run:
                 name: 'Copy coverage to baseline'
@@ -1735,7 +1739,7 @@ jobs:
             # Use the BuildNum to update the cache key so that the
             # coverage cache is always updated
             - save_cache:
-                key: v8-client-tests-coverage-{{ .BuildNum }}
+                key: v1-client-tests-coverage-integration{{ .BuildNum }}
                 paths:
                   - ~/transcom/mymove/tmp/baseline-jest-coverage
                 when: always
@@ -1752,7 +1756,6 @@ jobs:
                   --value "${coverage}" \
                   --timestamp "${timestamp}"
                 when: always
-
   # Compile the server side of the app once and persist the relevant
   # build artifacts to the workspace.
   # This way we don't have to re-run the build and since all necessary
@@ -2777,4 +2780,4 @@ experimental:
   notify:
     branches:
       only:
-        - main
+        - main

.envrc

@@ -220,9 +220,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-75
+# All of our DoD-signed certs are currently signed by DOD SW CA-66
 # This cannot be changed unless our certs are all resigned
-MOVE_MIL_DOD_CA_CERT=$(cat "${MYMOVE_DIR}"/config/tls/dod-sw-ca-75.pem)
+MOVE_MIL_DOD_CA_CERT=$(cat "${MYMOVE_DIR}"/config/tls/dod-sw-ca-66.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
@@ -444,4 +444,4 @@ then
 fi
 
 # Check that all required environment variables are set
-check_required_variables
+check_required_variables

.github/CODEOWNERS

@@ -6,4 +6,39 @@
 # owners will be requested for a review.
 # Add language specific code owners if it becomes relevant
 
-* @transcom/codeowners
+# database team
+/migrations/ @transcom/cacidatabaseteam
+/pkg/assets/sql_scripts/ @transcom/cacidatabaseteam
+
+# backend team
+/pkg/ @transcom/cacibackendteam
+/swagger-def/ @transcom/cacibackendteam
+*.go @transcom/cacibackendteam
+
+
+# frontend team
+/src/ @transcom/cacifrontendteam
+/playwright/tests/ @transcom/cacifrontendteam
+
+
+## not required for team specific review as prime UI is not deployed to production app
+src/components/PrimeUI/
+src/pages/PrimeUI/
+
+
+# Require tech lead review for changes to the following files
+.golangci.yml @transcom/codeowners
+.pre-commit-config.yaml @transcom/codeowners
+.eslintrc.js @transcom/codeowners
+/eslint-plugin-ato/ @transcom/codeowners
+/pkg/ato-linter/ @transcom/codeowners
+/scripts/ @transcom/codeowners
+/.circleci/config.yml @transcom/codeowners
+/config/ @transcom/codeowners
+Dockerfile* @transcom/codeowners
+Brewfile* @transcom/codeowners
+/Makefile @transcom/codeowners
+package.json @transcom/codeowners
+go.mod @transcom/codeowners
+/github/ @transcom/codeowners
+docker-compose* @transcom/codeowners

.github/workflows/happo-tests.yml

@@ -2,7 +2,7 @@ name: Happo CI
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main,integrationTesting]
 
 jobs:
   changes:

.gitlab-ci.yml

@@ -28,16 +28,16 @@ variables:
   GOLANGCI_LINT_VERBOSE: "-v"
 
   # Specify the environment: loadtest, demo, exp
-  DP3_ENV: &dp3_env placeholder_env
+  DP3_ENV: &dp3_env loadtest
 
   # Specify the branch to deploy TODO: this might be not needed. So far useless
-  DP3_BRANCH: &dp3_branch placeholder_branch_name
+  DP3_BRANCH: &dp3_branch integrationTesting
 
   # Ignore branches for integration tests
-  INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch placeholder_branch_name
-  INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch placeholder_branch_name
-  CLIENT_IGNORE_BRANCH: &client_ignore_branch placeholder_branch_name
-  SERVER_IGNORE_BRANCH: &server_ignore_branch placeholder_branch_name
+  INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch integrationTesting
+  INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch integrationTesting
+  CLIENT_IGNORE_BRANCH: &client_ignore_branch integrationTesting
+  SERVER_IGNORE_BRANCH: &server_ignore_branch integrationTesting
 
   RUNNER_TAG: &runner_tag milmove
   DOCKER_RUNNER_TAG: &docker_runner_tag eks_cluster_runner

Dockerfile

@@ -17,6 +17,7 @@ COPY bin/milmove /bin/milmove
 
 COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
 COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
+COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem
 
 COPY swagger/* /swagger/
 COPY build /build

Dockerfile.dp3

@@ -20,6 +20,11 @@ COPY config/tls/api.loadtest.dp3.us.crt /config/tls/api.loadtest.dp3.us.crt
 COPY config/tls/api.exp.dp3.us.chain.der.p7b /config/tls/api.exp.dp3.us.chain.der.p7b
 COPY config/tls/api.exp.dp3.us.crt /config/tls/api.exp.dp3.us.crt
 
+#copy dod certs
+COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
+COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
+COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem
+
 COPY swagger/* /swagger/
 COPY build /build
 COPY public/static/react-file-viewer /public/static/react-file-viewer

Dockerfile.local

@@ -27,7 +27,8 @@ 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-75.pem
+COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
+COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.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