Merge branch 'main' into B-19181-Create-PPTAS-API

transcom · May 30, 2024 · 67bb3b2 · 67bb3b2
2 parents de5ad80 + 32db98d
commit 67bb3b2
Show file tree

Hide file tree

Showing 297 changed files with 6,740 additions and 4,572 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -867,6 +867,7 @@ commands:
             export FEATURE_FLAG_NTSR=true
             export FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
             export FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+            export FEATURE_FLAG_COAST_GUARD_EMPLID=true
             export FEATURE_FLAG_MOVE_LOCK=false
             export FEATURE_FLAG_OKTA_DODID_INPUT=false
 
@@ -899,6 +900,7 @@ commands:
             FEATURE_FLAG_NTSR: 'true'
             FEATURE_FLAG_CAC_VALIDATED_LOGIN: 'false'
             FEATURE_FLAG_VALIDATION_CODE_REQUIRED: 'false'
+            FEATURE_FLAG_COAST_GUARD_EMPLID: 'true'
             FEATURE_FLAG_MOVE_LOCK: 'false'
             FEATURE_FLAG_OKTA_DODID_INPUT: 'false'
           command: |

diff --git a/.envrc b/.envrc
@@ -138,6 +138,9 @@ export FEATURE_FLAG_PPM=true
 export FEATURE_FLAG_NTS=true
 export FEATURE_FLAG_NTSR=true
 
+# Feature flag for EMPLID for USCG customers
+export FEATURE_FLAG_COAST_GUARD_EMPLID=true
+
 # 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
 export FEATURE_FLAG_CAC_VALIDATED_LOGIN=false

diff --git a/.github/workflows/analyze-bundle.yml b/.github/workflows/analyze-bundle.yml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Check out branch
         if: steps.cache-bundle-stats.outputs.cache-hit != 'true'
-        uses: actions/checkout@v4.1.2
+        uses: actions/checkout@v4.1.6
 
       - name: Set up node
         if: steps.cache-bundle-stats.outputs.cache-hit != 'true'
@@ -111,7 +111,7 @@ jobs:
 
       - name: Check out base branch
         if: steps.cache-bundle-stats.outputs.cache-hit != 'true'
-        uses: actions/checkout@v4.1.2
+        uses: actions/checkout@v4.1.6
         with:
           ref: ${{ github.base_ref }}
 

diff --git a/.github/workflows/front-end-linter.yml b/.github/workflows/front-end-linter.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4.1.2
+        uses: actions/checkout@v4.1.6
 
       - name: Set up node
         uses: actions/setup-node@v4

diff --git a/.github/workflows/go-auto-approve.yml b/.github/workflows/go-auto-approve.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v4.1.2
+        uses: actions/checkout@v4.1.6
         with:
           fetch-depth: 0
         if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'

diff --git a/.github/workflows/happo-tests-main.yml b/.github/workflows/happo-tests-main.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4.1.2
+        uses: actions/checkout@v4.1.6
 
       - name: Set up node
         uses: actions/setup-node@v4

diff --git a/.github/workflows/happo-tests.yml b/.github/workflows/happo-tests.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4.1.2
+        uses: actions/checkout@v4.1.6
 
       - name: Set up node
         uses: actions/setup-node@v4

diff --git a/.github/workflows/zap-scan.yml b/.github/workflows/zap-scan.yml
@@ -0,0 +1,30 @@
+name: zap-scan
+on: [push]
+
+jobs:
+  zap_scan:
+    runs-on: ubuntu-latest
+    name: Scan mymove
+    steps:
+      - name: ZAP Scan
+        uses: zaproxy/action-full-scan@v0.10.0
+        with:
+          target: 'https://my.move.mil'
+
+  zap_scan_office:
+    runs-on: ubuntu-latest
+    name: Scan Office
+    steps:
+      - name: ZAP Scan
+        uses: zaproxy/action-full-scan@v0.10.0
+        with:
+          target: 'https://office.move.mil'
+
+  zap_scan_admin:
+    runs-on: ubuntu-latest
+    name: Scan admin
+    steps:
+      - name: ZAP Scan
+        uses: zaproxy/action-full-scan@v0.10.0
+        with:
+          target: 'https://admin.move.mil'
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.20.0
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

diff --git a/Dockerfile.migrations b/Dockerfile.migrations
@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.20.0
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

diff --git a/Dockerfile.migrations_local b/Dockerfile.migrations_local
@@ -18,7 +18,7 @@ RUN rm -f bin/milmove && make bin/milmove
 # FINAL #
 #########
 
-FROM alpine:3.19.1
+FROM alpine:3.20.0
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

diff --git a/Dockerfile.reviewapp b/Dockerfile.reviewapp
@@ -45,7 +45,7 @@ RUN set -x \
   && make bin/generate-test-data
 
 # define migrations before client build since it doesn't need client
-FROM alpine:3.19.1 as migrate
+FROM alpine:3.20.0 as migrate
 
 COPY --from=server_builder /build/bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem
 COPY --from=server_builder /build/bin/milmove /bin/milmove

diff --git a/Dockerfile.tools b/Dockerfile.tools
@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.20.0
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

diff --git a/Dockerfile.tools_local b/Dockerfile.tools_local
@@ -18,7 +18,7 @@ RUN rm -f bin/prime-api-client && make bin/prime-api-client
 # FINAL #
 #########
 
-FROM alpine:3.19.1
+FROM alpine:3.20.0
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

diff --git a/config/env/demo.app-client-tls.env b/config/env/demo.app-client-tls.env
@@ -35,5 +35,6 @@ FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
 FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
-FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_OKTA_DODID_INPUT=false
diff --git a/config/env/demo.app.env b/config/env/demo.app.env
@@ -41,5 +41,6 @@ FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
 FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
-FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_OKTA_DODID_INPUT=false
diff --git a/config/env/exp.app-client-tls.env b/config/env/exp.app-client-tls.env
@@ -35,5 +35,6 @@ FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
 FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
-FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_OKTA_DODID_INPUT=false
diff --git a/config/env/exp.app.env b/config/env/exp.app.env
@@ -41,5 +41,6 @@ FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
 FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
-FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_OKTA_DODID_INPUT=false
diff --git a/config/env/loadtest.app-client-tls.env b/config/env/loadtest.app-client-tls.env
@@ -33,5 +33,6 @@ FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
 FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
-FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_OKTA_DODID_INPUT=false
diff --git a/config/env/loadtest.app.env b/config/env/loadtest.app.env
@@ -39,5 +39,6 @@ FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
 FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
-FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_OKTA_DODID_INPUT=false
diff --git a/config/env/prd.app-client-tls.env b/config/env/prd.app-client-tls.env
@@ -32,5 +32,6 @@ FEATURE_FLAG_NTS=false
 FEATURE_FLAG_NTSR=false
 FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
 FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
-FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_OKTA_DODID_INPUT=false
diff --git a/config/env/prd.app.env b/config/env/prd.app.env
@@ -40,5 +40,6 @@ FEATURE_FLAG_NTS=false
 FEATURE_FLAG_NTSR=false
 FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
 FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
-FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_OKTA_DODID_INPUT=false
diff --git a/config/env/stg.app-client-tls.env b/config/env/stg.app-client-tls.env
@@ -34,5 +34,6 @@ FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
 FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
-FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_OKTA_DODID_INPUT=false
diff --git a/config/env/stg.app.env b/config/env/stg.app.env
@@ -41,5 +41,6 @@ FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
 FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+FEATURE_FLAG_COAST_GUARD_EMPLID=false
 FEATURE_FLAG_MOVE_LOCK=false
-FEATURE_FLAG_OKTA_DODID_INPUT=false
+FEATURE_FLAG_OKTA_DODID_INPUT=false
diff --git a/config/flipt/storage/development.features.yaml b/config/flipt/storage/development.features.yaml
@@ -73,6 +73,14 @@ flags:
   - segment:
       key: mil-app
       value: true
+- key: coast_guard_emplid
+  name: USCG EMPLID feature flag
+  type: BOOLEAN_FLAG_TYPE
+  enabled: true
+  rollouts:
+  - segment:
+      key: mil-app
+      value: true
 - key: boolean_flag
   name: Boolean Flag
   type: BOOLEAN_FLAG_TYPE

diff --git a/go.mod b/go.mod
@@ -7,19 +7,19 @@ require (
 	github.com/XSAM/otelsql v0.23.0
 	github.com/alexedwards/scs/redisstore v0.0.0-20221223131519-238b052508b6
 	github.com/alexedwards/scs/v2 v2.5.1
-	github.com/aws/aws-sdk-go-v2 v1.21.0
-	github.com/aws/aws-sdk-go-v2/config v1.18.39
-	github.com/aws/aws-sdk-go-v2/credentials v1.13.37
-	github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.2.19
-	github.com/aws/aws-sdk-go-v2/service/cloudwatchevents v1.15.13
-	github.com/aws/aws-sdk-go-v2/service/ecr v1.19.5
-	github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1
-	github.com/aws/aws-sdk-go-v2/service/rds v1.54.0
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.38.5
-	github.com/aws/aws-sdk-go-v2/service/ses v1.16.7
-	github.com/aws/aws-sdk-go-v2/service/ssm v1.37.5
-	github.com/aws/aws-sdk-go-v2/service/sts v1.21.5
-	github.com/aws/smithy-go v1.14.2
+	github.com/aws/aws-sdk-go-v2 v1.27.0
+	github.com/aws/aws-sdk-go-v2/config v1.27.14
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.14
+	github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.4.6
+	github.com/aws/aws-sdk-go-v2/service/cloudwatchevents v1.23.6
+	github.com/aws/aws-sdk-go-v2/service/ecr v1.28.1
+	github.com/aws/aws-sdk-go-v2/service/ecs v1.41.11
+	github.com/aws/aws-sdk-go-v2/service/rds v1.78.2
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.54.1
+	github.com/aws/aws-sdk-go-v2/service/ses v1.22.7
+	github.com/aws/aws-sdk-go-v2/service/ssm v1.50.2
+	github.com/aws/aws-sdk-go-v2/service/sts v1.28.8
+	github.com/aws/smithy-go v1.20.2
 	github.com/benbjohnson/clock v1.3.5
 	github.com/codegangsta/gin v0.0.0-20211113050330-71f90109db02
 	github.com/disintegration/imaging v1.6.2
@@ -46,7 +46,7 @@ require (
 	github.com/gocarina/gocsv v0.0.0-20221216233619-1fea7ae8d380
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/golang-jwt/jwt/v4 v4.5.0
-	github.com/gomodule/redigo v1.8.9
+	github.com/gomodule/redigo v1.9.2
 	github.com/google/go-github/v31 v31.0.0
 	github.com/gorilla/csrf v1.7.1
 	github.com/imdario/mergo v0.3.16
@@ -93,11 +93,11 @@ require (
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.21.0
 	golang.org/x/net v0.23.0
-	golang.org/x/oauth2 v0.17.0
+	golang.org/x/oauth2 v0.20.0
 	golang.org/x/text v0.14.0
 	golang.org/x/tools v0.13.0
 	google.golang.org/grpc v1.62.0
-	gopkg.in/dnaeon/go-vcr.v3 v3.1.2
+	gopkg.in/dnaeon/go-vcr.v3 v3.2.0
 	gotest.tools/gotestsum v1.10.1
 	pault.ag/go/pksigner v1.0.2
 )
@@ -133,18 +133,18 @@ require (
 	github.com/Masterminds/semver/v3 v3.2.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.36 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.13.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.6 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.2 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.20.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/brunoscheufler/aws-ecs-metadata-go v0.0.0-20221221133751-67e37ae746cd // indirect
 	github.com/chigopher/pathlib v1.0.0 // indirect
@@ -260,7 +260,6 @@ require (
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.19.0 // indirect
 	golang.org/x/term v0.18.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect