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

transcom · May 16, 2024 · 53fe4a3 · 53fe4a3
2 parents 52d99ed + bbd3295
commit 53fe4a3
Show file tree

Hide file tree

Showing 440 changed files with 7,764 additions and 2,254 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-726bfe44bd27d3b41da41acbe3eb231811a993f7
+  circleci-docker: &circleci-docker milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d
 
   # 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-v5-{{ checksum "go.sum" }}-{{ checksum ".go-version" }}
+            - go-mod-sources-v7-{{ checksum "go.sum" }}-{{ checksum ".go-version" }}
 
   save_cache_for_go:
     steps:
       - create_dot_go_version
       - save_cache:
-          key: go-mod-sources-v5-{{ checksum "go.sum" }}-{{ checksum ".go-version" }}
+          key: go-mod-sources-v7-{{ checksum "go.sum" }}-{{ checksum ".go-version" }}
           paths:
             - '~/go'
             - '~/transcom/mymove/bin/swagger'
@@ -867,6 +867,8 @@ commands:
             export FEATURE_FLAG_NTSR=true
             export FEATURE_FLAG_CAC_VALIDATED_LOGIN=false
             export FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+            export FEATURE_FLAG_MOVE_LOCK=false
+            export FEATURE_FLAG_OKTA_DODID_INPUT=false
 
             # disable for speed, playwright tests can fail otherwise
             export DB_DEBUG=false
@@ -897,6 +899,8 @@ commands:
             FEATURE_FLAG_NTSR: 'true'
             FEATURE_FLAG_CAC_VALIDATED_LOGIN: 'false'
             FEATURE_FLAG_VALIDATION_CODE_REQUIRED: 'false'
+            FEATURE_FLAG_MOVE_LOCK: 'false'
+            FEATURE_FLAG_OKTA_DODID_INPUT: 'false'
           command: |
             SHARD=$((${CIRCLE_NODE_INDEX}+1))
             PLAYWRIGHT_JUNIT_OUTPUT_NAME=playwright-results.xml \
@@ -1267,7 +1271,7 @@ jobs:
             #
             # The trailing hyphen in restore_cache seems important
             # according to the page linked above
-            - v17-spectral-lint-
+            - v20-spectral-lint-
       - run:
           name: Save Baseline Spectral Lint
           command: |
@@ -1326,7 +1330,7 @@ jobs:
             # Use the BuildNum to update the cache key so that the
             # coverage cache is always updated
             - save_cache:
-                key: v17-spectral-lint-{{ .BuildNum }}
+                key: v20-spectral-lint-{{ .BuildNum }}
                 paths:
                   - ~/transcom/mymove/spectral
       - store_artifacts:

diff --git a/.envrc b/.envrc
@@ -129,6 +129,8 @@ export DB_SSL_MODE=disable
 export FEATURE_FLAG_MULTI_MOVE=true
 export FEATURE_FLAG_COUNSELOR_MOVE_CREATE=true
 export FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
+export FEATURE_FLAG_MOVE_LOCK=false
+export FEATURE_FLAG_OKTA_DODID_INPUT=false
 
 # Feature flags to disable certain shipment types
 export FEATURE_FLAG_PPM=true

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.20.6'
+          go-version: '1.22.2'
       - name: Tidy
         run: |
           go version

diff --git a/.gitignore b/.gitignore
@@ -99,6 +99,7 @@ playwright-results.xml
 !pkg/parser/pricing/fixtures/8_2c_domestic_other_prices_sit_golden.csv
 !pkg/parser/pricing/fixtures/pricing_template_2019-09-19_fake-data.xlsx
 !pkg/parser/transittime/fixtures/Appendix_C(i)_-_Transit_Time_Tables_Fake_Data.xlsx
+!pkg/testdatagen/testdata/Weight Estimator Full.xlsx
 !pkg/testdatagen/testdata/Weight Estimator.xlsx
 !pkg/testdatagen/testdata/Weight Estimator.xls
 !pkg/testdatagen/testdata/test.xls

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,5 +1,12 @@
 ---
 linters-settings:
+  revive:
+    rules:
+      - name: indent-error-flow
+        disabled: true
+      - name: superfluous-else
+        disabled: true
+
   gci:
     sections:
       - standard
@@ -32,8 +39,6 @@ linters-settings:
               - github.com/benbjohnson/clock
             reason: facebookgo/clock is archived and inactive, recommend using original fork
               repo
-  govet:
-    check-shadowing: true
 linters:
   enable:
     - errcheck
@@ -47,17 +52,16 @@ linters:
     - ineffassign
     - revive
     - staticcheck
-    - typecheck
+    #- typecheck
     - unused
   fast: false
 issues:
   fix: true
+  exclude-dirs:
+    - pkg/gen
+    - .*mocks
 run:
   timeout: 8m
   concurrency: 1
   issues-exit-code: 1
   tests: true
-  skip-dirs:
-    - pkg/gen
-    - .*mocks
-  skip-dirs-use-default: true
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-18.13.0
+18.20.2
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -58,7 +58,7 @@ repos:
         exclude: ^public/swagger-ui/
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.53.3
+    rev: v1.57.2
     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.20.6
-nodejs 18.13.0
+golang 1.22.2
+nodejs 18.20.2
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get install -y ca-certificates --no-install-recommends
 RUN update-ca-certificates
 
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base:latest@sha256:9bc3117a99c731a41200a28774405125cb6fbda1819f4a1af88bd3bfad5dcf32
+FROM gcr.io/distroless/base-debian11@sha256:2fb55308ef768a0ca0851f294d7f5b582579dba6522d1d2162e2d5f33b876e97
 COPY --from=build-env /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
 COPY bin/rds-ca-rsa4096-g1.pem /bin/rds-ca-rsa4096-g1.pem

diff --git a/Dockerfile.dp3 b/Dockerfile.dp3
@@ -1,5 +1,5 @@
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base:latest@sha256:9bc3117a99c731a41200a28774405125cb6fbda1819f4a1af88bd3bfad5dcf32
+FROM gcr.io/distroless/base-debian11@sha256:2fb55308ef768a0ca0851f294d7f5b582579dba6522d1d2162e2d5f33b876e97
 
 #AWS GovCloud RDS cert
 COPY bin/rds-ca-rsa4096-g1.pem /bin/rds-ca-rsa4096-g1.pem

diff --git a/Dockerfile.local b/Dockerfile.local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-726bfe44bd27d3b41da41acbe3eb231811a993f7 as builder
+FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
 
 ENV CIRCLECI=true
 
@@ -20,7 +20,7 @@ RUN rm -f bin/milmove && make bin/milmove
 #########
 
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base:latest@sha256:9bc3117a99c731a41200a28774405125cb6fbda1819f4a1af88bd3bfad5dcf32
+FROM gcr.io/distroless/base-debian11@sha256:2fb55308ef768a0ca0851f294d7f5b582579dba6522d1d2162e2d5f33b876e97
 
 COPY --from=builder --chown=root:root /home/circleci/project/bin/rds-ca-rsa4096-g1.pem /bin/rds-ca-rsa4096-g1.pem
 COPY --from=builder --chown=root:root /home/circleci/project/bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem

diff --git a/Dockerfile.migrations_local b/Dockerfile.migrations_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-726bfe44bd27d3b41da41acbe3eb231811a993f7 as builder
+FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d 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-726bfe44bd27d3b41da41acbe3eb231811a993f7 as builder
+FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
 
 ENV CIRCLECI=docker
 ENV REACT_APP_NODE_ENV=development
@@ -106,7 +106,7 @@ RUN set -x \
 #########
 
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base:latest@sha256:9bc3117a99c731a41200a28774405125cb6fbda1819f4a1af88bd3bfad5dcf32 as milmove
+FROM gcr.io/distroless/base-debian11@sha256:2fb55308ef768a0ca0851f294d7f5b582579dba6522d1d2162e2d5f33b876e97 as milmove
 
 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.tasks b/Dockerfile.tasks
@@ -8,7 +8,7 @@ RUN apt-get install -y ca-certificates --no-install-recommends
 RUN update-ca-certificates
 
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base:latest@sha256:9bc3117a99c731a41200a28774405125cb6fbda1819f4a1af88bd3bfad5dcf32
+FROM gcr.io/distroless/base-debian11@sha256:2fb55308ef768a0ca0851f294d7f5b582579dba6522d1d2162e2d5f33b876e97
 COPY --from=build-env /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
 COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b

diff --git a/Dockerfile.tasks_dp3 b/Dockerfile.tasks_dp3
@@ -1,5 +1,5 @@
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base:latest@sha256:9bc3117a99c731a41200a28774405125cb6fbda1819f4a1af88bd3bfad5dcf32
+FROM gcr.io/distroless/base-debian11@sha256:2fb55308ef768a0ca0851f294d7f5b582579dba6522d1d2162e2d5f33b876e97
 
 # Demo Environment Certs
 COPY config/tls/api.demo.dp3.us.chain.der.p7b /config/tls/api.demo.dp3.us.chain.der.p7b

diff --git a/Dockerfile.tasks_local b/Dockerfile.tasks_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-726bfe44bd27d3b41da41acbe3eb231811a993f7 as builder
+FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
 
 ENV CIRCLECI=true
 
@@ -19,7 +19,7 @@ RUN rm -f bin/milmove-tasks && make bin/milmove-tasks
 #########
 
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base:latest@sha256:9bc3117a99c731a41200a28774405125cb6fbda1819f4a1af88bd3bfad5dcf32
+FROM gcr.io/distroless/base-debian11@sha256:2fb55308ef768a0ca0851f294d7f5b582579dba6522d1d2162e2d5f33b876e97
 
 COPY --from=builder --chown=root:root /home/circleci/project/config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
 COPY --from=builder --chown=root:root /home/circleci/project/bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem

diff --git a/Dockerfile.tools_local b/Dockerfile.tools_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-726bfe44bd27d3b41da41acbe3eb231811a993f7 as builder
+FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d 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-726bfe44bd27d3b41da41acbe3eb231811a993f7 as builder
+FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d 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-726bfe44bd27d3b41da41acbe3eb231811a993f7 as builder
+FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d 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-726bfe44bd27d3b41da41acbe3eb231811a993f7 as builder
+FROM milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d as builder
 
 # Prepare public DOD certificates.
 # hadolint ignore=DL3002

diff --git a/Makefile b/Makefile
@@ -1053,7 +1053,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-726bfe44bd27d3b41da41acbe3eb231811a993f7 bash
+	docker run -it --pull=always --rm=true -v $(PWD):$(PWD) -w $(PWD) -e CIRCLECI=1 milmove/circleci-docker:milmove-app-ab729849a08a773ea2557b19b67f378551d1ad3d bash
 
 .PHONY: docker_local_ssh_server_with_password
 docker_local_ssh_server_with_password:

diff --git a/cmd/ecs-deploy/main.go b/cmd/ecs-deploy/main.go
@@ -74,7 +74,7 @@ func main() {
 		Use:   "completion",
 		Short: "Generates bash completion scripts",
 		Long:  "To install completion scripts run:\n\necs-deploy completion > /usr/local/etc/bash_completion.d/ecs-deploy",
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			return root.GenBashCompletion(os.Stdout)
 		},
 	}

diff --git a/cmd/milmove-tasks/main.go b/cmd/milmove-tasks/main.go
@@ -81,7 +81,7 @@ func main() {
 		Use:   "completion",
 		Short: "Generates bash completion scripts",
 		Long:  "To install completion scripts run:\n\nmilmove-tasks completion > /usr/local/etc/bash_completion.d/milmove-tasks",
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			return root.GenBashCompletion(os.Stdout)
 		},
 	}

diff --git a/cmd/milmove/main.go b/cmd/milmove/main.go
@@ -133,7 +133,7 @@ func main() {
 		Use:   "completion",
 		Short: "Generates bash completion scripts",
 		Long:  "To install completion scripts run:\n\nmilmove completion > /usr/local/etc/bash_completion.d/milmove",
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			return root.GenBashCompletion(os.Stdout)
 		},
 	}

diff --git a/cmd/milmove/migrate.go b/cmd/milmove/migrate.go
@@ -176,6 +176,8 @@ func migrateFunction(cmd *cobra.Command, args []string) error {
 	migrationPaths := expandPaths(strings.Split(trimmedMigrationPaths, ";"))
 	logger.Info(fmt.Sprintf("using migration paths %q", migrationPaths))
 
+	logger.Info("migration Path from s3")
+
 	s3Migrations := false
 	for _, p := range migrationPaths {
 		if strings.HasPrefix(p, "s3://") {
@@ -190,6 +192,8 @@ func migrateFunction(cmd *cobra.Command, args []string) error {
 	retryMax := v.GetInt(cli.DbRetryMaxFlag)
 	retryInterval := v.GetDuration(cli.DbRetryIntervalFlag)
 
+	logger.Info("get db config")
+
 	dbConnection, err = cli.InitDatabase(v, logger)
 	if err != nil {
 		logger.Fatal("Invalid DB Configuration", zap.Error(err))

diff --git a/cmd/milmove/serve.go b/cmd/milmove/serve.go
@@ -502,7 +502,7 @@ func buildRoutingConfig(appCtx appcontext.AppContext, v *viper.Viper, redisPool
 		)
 	} else {
 		// this spins up a local test server
-		fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 			w.WriteHeader(http.StatusOK)
 		}))
 		gexSender = invoice.NewGexSenderHTTP(

diff --git a/cmd/prime-api-client/main.go b/cmd/prime-api-client/main.go
@@ -532,7 +532,7 @@ func main() {
 		Use:   "completion",
 		Short: "Generates bash completion scripts",
 		Long:  "To install completion scripts run:\n\nprime-api-client completion > /usr/local/etc/bash_completion.d/prime-api-client",
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			return root.GenBashCompletion(os.Stdout)
 		},
 	}