Deploy integrationTesting to loadTest Env

.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
@@ -40,11 +40,12 @@ references:
 
   # In addition, it's common practice to disable acceptance tests and
   # ignore tests for dp3 deploys. See the branch settings below.
-  dp3-branch: &dp3-branch placeholder_branch_name
   # MUST BE ONE OF: loadtest, demo, exp.
   # These are used to pull in env vars so the spelling matters!
-  dp3-env: &dp3-env placeholder_env
-
+  dp3-branch: &dp3-branch integrationTesting
+  # MUST BE ONE OF: loadtest, demo, exp.
+  # These are used to pull in env vars so the spelling matters!
+  dp3-env: &dp3-env loadtest
   # set integration-ignore-branch to the branch if you want to IGNORE
   # integration tests, or `placeholder_branch_name` if you do want to
   # run them
@@ -53,17 +54,19 @@ 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
   # them
-  client-ignore-branch: &client-ignore-branch placeholder_branch_name
+  client-ignore-branch: &client-ignore-branch integrationTesting
 
   # set server-ignore-branch to the branch if you want to IGNORE
   # server tests, or `placeholder_branch_name` if you do want to run
   # them
-  server-ignore-branch: &server-ignore-branch placeholder_branch_name
+
+  server-ignore-branch: &server-ignore-branch integrationTesting
 
 executors:
   base_small:
@@ -277,13 +280,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'
@@ -779,7 +782,6 @@ commands:
             OKTA_API_KEY: notrealapikey8675309
             OKTA_OFFICE_GROUP_ID: notrealgroupId
             OKTA_CUSTOMER_GROUP_ID: notrealcustomergroupId
-
   # run playwright tests without using setup_remote_docker
   # the remote docker resources are not configurable and thus are
   # SLOOOOOOW
@@ -849,7 +851,6 @@ commands:
             export OKTA_API_KEY=notrealapikey
             export OKTA_OFFICE_GROUP_ID=notrealgroupId
             export OKTA_CUSTOMER_GROUP_ID=notrealcustomergroupId
-
             export SERVE_API_PRIME=false
             export SERVE_API_SUPPORT=true
             export SERVE_PRIME_SIMULATOR=true
@@ -874,8 +875,8 @@ commands:
             export FEATURE_FLAG_HEADQUARTERS_ROLE=false
             export FEATURE_FLAG_GSR_ROLE=false
             export FEATURE_FLAG_SAFETY_MOVE=false
-            export FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
             export FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
+            export FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
             export FEATURE_FLAG_QUEUE_MANAGEMENT=false
 
             # disable for speed, playwright tests can fail otherwise
@@ -990,7 +991,6 @@ commands:
             export OKTA_API_KEY=notrealapikey
             export OKTA_OFFICE_GROUP_ID=notrealgroupId
             export OKTA_CUSTOMER_GROUP_ID=notrealcustomergroupId
-
             export SERVE_API_SUPPORT=true
             export SERVE_PRIME_SIMULATOR=true
             export DEVLOCAL_CA=$PWD/config/tls/devlocal-ca.pem
@@ -1079,7 +1079,6 @@ commands:
             export OKTA_API_KEY=notrealapikey
             export OKTA_OFFICE_GROUP_ID=notrealgroupId
             export OKTA_CUSTOMER_GROUP_ID=notrealcustomergroupId
-
             export SERVE_API_SUPPORT=true
             export MUTUAL_TLS_ENABLED=true
             export SERVE_PRIME_SIMULATOR=true

.envrc

@@ -128,7 +128,7 @@ export DB_SSL_MODE=disable
 # Multi Move feature flag
 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
 export FEATURE_FLAG_SAFETY_MOVE=true

.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

.github/workflows/happo-tests-main.yml

@@ -20,6 +20,10 @@ jobs:
       - name: Install dependencies
         run: yarn install --frozen-lockfile
 
+      # This step was specifically added for npm canvas, per https://www.npmjs.com/package/canvas
+      - name: Install system level dependencies
+        run: sudo apt-get install build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
+
       - name: Start Happo run
         run: yarn happo-ci-github-actions
         env:

.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

.tool-versions

@@ -1,2 +1,2 @@
-golang 1.22.2
-nodejs 18.20.2
+golang 1.23.1
+nodejs 18.20.4

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-debian11@sha256:ac69aa622ea5dcbca0803ca877d47d069f51bd4282d5c96977e0390d7d256455
+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

Dockerfile.dp3

@@ -1,5 +1,5 @@
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base-debian11@sha256:ac69aa622ea5dcbca0803ca877d47d069f51bd4282d5c96977e0390d7d256455
+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

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
 
@@ -20,7 +20,7 @@ RUN rm -f bin/milmove && make bin/milmove
 #########
 
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base-debian11@sha256:ac69aa622ea5dcbca0803ca877d47d069f51bd4282d5c96977e0390d7d256455
+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

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
 
@@ -21,7 +21,7 @@ RUN rm -f bin/milmove && make bin/milmove
 FROM alpine:3.20.2
 
 # hadolint ignore=DL3017
-RUN apk upgrade --no-cache busybox
+RUN apk upgrade --no-cache busybox --force-missing-repositories
 
 COPY --from=builder --chown=root:root /home/circleci/project/bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem
 COPY --from=builder --chown=root:root /home/circleci/project/bin/milmove /bin/milmove

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
@@ -106,7 +106,7 @@ RUN set -x \
 #########
 
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base-debian11@sha256:ac69aa622ea5dcbca0803ca877d47d069f51bd4282d5c96977e0390d7d256455 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

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-debian11@sha256:ac69aa622ea5dcbca0803ca877d47d069f51bd4282d5c96977e0390d7d256455
+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

Dockerfile.tasks_dp3

@@ -1,5 +1,5 @@
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base-debian11@sha256:ac69aa622ea5dcbca0803ca877d47d069f51bd4282d5c96977e0390d7d256455
+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

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
 
@@ -19,7 +19,7 @@ RUN rm -f bin/milmove-tasks && make bin/milmove-tasks
 #########
 
 # hadolint ignore=DL3007
-FROM gcr.io/distroless/base-debian11@sha256:ac69aa622ea5dcbca0803ca877d47d069f51bd4282d5c96977e0390d7d256455
+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

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
 

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

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

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

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:

cmd/generate-payment-request-edi/main.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/benbjohnson/clock"
 	"github.com/spf13/pflag"
@@ -51,6 +52,8 @@ func initFlags(flag *pflag.FlagSet) {
 	// Logging Levels
 	cli.InitLoggingFlags(flag)
 
+	cli.InitStorageFlags(flag)
+
 	// Don't sort flags
 	flag.SortFlags = false
 }
@@ -125,7 +128,10 @@ func main() {
 	if envFlag == "production" || envFlag == "prod" || envFlag == "prd" {
 		isProd = true
 	}
-
+	if err != nil {
+		logger.Fatal("Failed to get next ICN value", zap.Error(err))
+	}
+	fileName := fmt.Sprintf("%s_edi858.txt", time.Now().Format("2006_01_02T15_04_05Z07_00"))
 	edi858c, err := generator.Generate(appCtx, paymentRequest, isProd)
 	if err != nil {
 		logger.Fatal(err.Error())
@@ -135,6 +141,15 @@ func main() {
 	if err != nil {
 		logger.Fatal(err.Error())
 	}
+	logger.Info(edi858String)
+	storeInvoice := invoice.StoreInvoice858C{}
+	verrs, err := storeInvoice.Call(appCtx, edi858String, &paymentRequest, fileName)
+	if verrs != nil && verrs.HasAny() {
+		logger.Fatal(verrs.Error())
+	}
 
-	fmt.Print(edi858String)
+	if err != nil {
+		logger.Fatal(err.Error())
+	}
+	logger.Info("Successfully stored invoice")
 }

cmd/ghc-pricing-parser/main.go

@@ -324,7 +324,7 @@ func summarizeModel(appCtx appcontext.AppContext, header string, modelInstance i
 	if err != nil {
 		return err
 	}
-	pterm.Printf(pterm.Gray("(representative rows above; " + pterm.Green(length) + " rows total)\n\n"))
+	pterm.Printf(pterm.Gray("(representative rows above; %s rows total)\n\n"), pterm.Green(length))
 
 	return nil
 }

cmd/pptas-api-client/main.go

@@ -34,15 +34,15 @@ func main() {
 	}
 	initRootFlags(root.PersistentFlags())
 
-	listMovesCommand := &cobra.Command{
+	PPTASReportsCommand := &cobra.Command{
 		Use:          "list-moves",
 		Short:        "An optimized fetch for all moves available to Prime",
 		Long:         "Fetches moves that are available to Prime quickly, without all the data for nested objects.",
-		RunE:         pptas.ListMoves,
+		RunE:         pptas.PPTASReports,
 		SilenceUsage: true,
 	}
-	pptas.InitListMovesFlags(listMovesCommand.Flags())
-	root.AddCommand(listMovesCommand)
+	pptas.InitPPTASReportsFlags(PPTASReportsCommand.Flags())
+	root.AddCommand(PPTASReportsCommand)
 
 	if err := root.Execute(); err != nil {
 		panic(err)