merge main

transcom · Jan 27, 2025 · 5b4d602 · 5b4d602
2 parents f72d50e + 52ff3a7
commit 5b4d602
Show file tree

Hide file tree

Showing 101 changed files with 3,179 additions and 1,462 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2653,7 +2653,7 @@ workflows:
             - integration_tests_mtls
           filters:
             branches:
-              only: main
+              only: nolonger_main
 
       - deploy_stg_migrations:
           requires:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -128,18 +128,18 @@ stages:
 .setup_release_stg: &setup_release_stg
   #if main
   - export ECR_REPOSITORY_URI=${STG_ACCOUNT_ID}.dkr.ecr.${STG_REGION}.amazonaws.com
-  - export APP_DOCKER_FILE=Dockerfile.dp3
-  - export TASK_DOCKER_FILE=Dockerfile.tasks_dp3
+  - export APP_DOCKER_FILE=Dockerfile
+  - export TASK_DOCKER_FILE=Dockerfile.tasks
   #TODO: update demo to stg
-  - export APP_ENVIRONMENT=demo
+  - export APP_ENVIRONMENT=stg
 
 .setup_release_prd: &setup_release_prd
   #build off prd variables
   - export ECR_REPOSITORY_URI=${PRD_ACCOUNT_ID}.dkr.ecr.${PRD_REGION}.amazonaws.com
-  - export APP_DOCKER_FILE=Dockerfile.dp3
-  - export TASK_DOCKER_FILE=Dockerfile.tasks_dp3
+  - export APP_DOCKER_FILE=Dockerfile
+  - export TASK_DOCKER_FILE=Dockerfile
   #TODO: update exp to prod
-  - export APP_ENVIRONMENT=exp
+  - export APP_ENVIRONMENT=prd
 
 .kaniko_before_setup: &kaniko_before_setup
   # prep login for kaniko
@@ -148,7 +148,7 @@ stages:
   echo "{\"credHelpers\":{\"${ECR_REPOSITORY_URI}\":\"ecr-login\"}}" > /kaniko/.docker/config.json
 
 .check_dp3: &check_dp3
-  - if: (($DP3_ENV == "exp" || $DP3_ENV == "loadtest" || $DP3_ENV == "demo") && $DP3_BRANCH == $CI_COMMIT_BRANCH)
+ - if: (($DP3_ENV == "exp" || $DP3_ENV == "loadtest" || $DP3_ENV == "demo") && $DP3_BRANCH == $CI_COMMIT_BRANCH)
 
 .check_main: &check_main
   - if: '$CI_COMMIT_BRANCH == "main"'
@@ -1197,17 +1197,20 @@ push_otel_collector_image_dp3:
     - compile_app_server
     - compile_app_client
   script:
-    - echo "Logging in to Amazon ECR with Crane..."
-    - aws ecr get-login-password --region us-gov-west-1 | crane auth login ${ECR_REPOSITORY_URI} -u AWS --password-stdin
+     - echo "Logging in to DockerHub with Crane..."
+     - echo "${DOCKERHUB_PASSWORD}" | crane auth login docker.io -u "${DOCKERHUB_USERNAME}" --password-stdin
 
-    - echo "Pulling the AWS OTel Collector image from the public registry with Crane..."
-    - crane pull --insecure public.ecr.aws/aws-observability/aws-otel-collector:v0.31.0 image.tar
+     - echo "Pulling the AWS OTel Collector image from Dockerhub with Crane..."
+     - crane pull $ECR_REPOSITORY_OTEL:$OTEL_VERSION image.tar
 
-    - echo "Pushing the image to our private ECR using Crane..."
-    - crane push --insecure image.tar ${ECR_REPOSITORY_URI}/otel-collector:${CI_COMMIT_SHORT_SHA}
+     - echo "Logging in to AWS ECR with Crane..."
+     - aws ecr get-login-password --region $AWS_DEFAULT_REGION | crane auth login ${ECR_REPOSITORY_URI} -u AWS --password-stdin
 
-    - echo "Cleaning up the temporary image file..."
-    - rm image.tar
+     - echo "Pushing the image to our private ECR using Crane..."
+     - crane push image.tar ${ECR_REPOSITORY_URI}/otel-collector:${CI_COMMIT_SHORT_SHA}
+
+     - echo "Cleaning up the temporary image file..."
+     - rm image.tar
   allow_failure: false
   after_script:
     - *announce_failure
@@ -1452,17 +1455,20 @@ push_otel_collector_image_stg:
     - *setup_aws_vars_stg
     - *setup_release_stg
   script:
-    - echo "Logging in to Amazon ECR with Crane..."
-    - aws ecr get-login-password --region us-gov-west-1 | crane auth login ${ECR_REPOSITORY_URI} -u AWS --password-stdin
+     - echo "Logging in to DockerHub with Crane..."
+     - echo "${DOCKERHUB_PASSWORD}" | crane auth login docker.io -u "${DOCKERHUB_USERNAME}" --password-stdin
+
+     - echo "Pulling the AWS OTel Collector image from Dockerhub with Crane..."
+     - crane pull $ECR_REPOSITORY_OTEL:$OTEL_VERSION image.tar
 
-    - echo "Pulling the AWS OTel Collector image from the public registry with Crane..."
-    - crane pull --insecure public.ecr.aws/aws-observability/aws-otel-collector:v0.31.0 image.tar
+     - echo "Logging in to AWS ECR with Crane..."
+     - aws ecr get-login-password --region $AWS_DEFAULT_REGION | crane auth login ${ECR_REPOSITORY_URI} -u AWS --password-stdin
 
-    - echo "Pushing the image to our private ECR using Crane..."
-    - crane push --insecure image.tar ${ECR_REPOSITORY_URI}/otel-collector:${CI_COMMIT_SHORT_SHA}
+     - echo "Pushing the image to our private ECR using Crane..."
+     - crane push image.tar ${ECR_REPOSITORY_URI}/otel-collector:${CI_COMMIT_SHORT_SHA}
 
-    - echo "Cleaning up the temporary image file..."
-    - rm image.tar
+     - echo "Cleaning up the temporary image file..."
+     - rm image.tar
   allow_failure: false
   after_script:
     - *announce_failure
@@ -1725,17 +1731,20 @@ push_otel_collector_image_prd:
     - *setup_aws_vars_prd
     - *setup_release_prd
   script:
-    - echo "Logging in to Amazon ECR with Crane..."
-    - aws ecr get-login-password --region us-gov-west-1 | crane auth login ${ECR_REPOSITORY_URI} -u AWS --password-stdin
+     - echo "Logging in to DockerHub with Crane..."
+     - echo "${DOCKERHUB_PASSWORD}" | crane auth login docker.io -u "${DOCKERHUB_USERNAME}" --password-stdin
+
+     - echo "Pulling the AWS OTel Collector image from Dockerhub with Crane..."
+     - crane pull $ECR_REPOSITORY_OTEL:$OTEL_VERSION image.tar
 
-    - echo "Pulling the AWS OTel Collector image from the public registry with Crane..."
-    - crane pull --insecure public.ecr.aws/aws-observability/aws-otel-collector:v0.31.0 image.tar
+     - echo "Logging in to AWS ECR with Crane..."
+     - aws ecr get-login-password --region $AWS_DEFAULT_REGION | crane auth login ${ECR_REPOSITORY_URI} -u AWS --password-stdin
 
-    - echo "Pushing the image to our private ECR using Crane..."
-    - crane push --insecure image.tar ${ECR_REPOSITORY_URI}/otel-collector:${CI_COMMIT_SHORT_SHA}
+     - echo "Pushing the image to our private ECR using Crane..."
+     - crane push image.tar ${ECR_REPOSITORY_URI}/otel-collector:${CI_COMMIT_SHORT_SHA}
 
-    - echo "Cleaning up the temporary image file..."
-    - rm image.tar
+     - echo "Cleaning up the temporary image file..."
+     - rm image.tar
   allow_failure: false
   after_script:
     - *announce_failure

diff --git a/Makefile b/Makefile
@@ -1232,7 +1232,9 @@ nonato_deploy_restore:  ## Restore placeholders in config after deploy to a non-
 # ----- END NON-ATO DEPLOYMENT TARGETS -----
 #
 
-# ----- START NON-ATO DEPLOYMENT GITLAB TARGETS -----
+
+#
+# ----- START NON-ATO DEPLOYMENT TARGETS -----
 #
 
 .PHONY: nonato_gitlab_deploy_prepare
@@ -1253,7 +1255,7 @@ endif
 	sed -E -i '' "s#(&server_ignore_branch) placeholder_branch_name#\1 $(GIT_BRANCH)#" .gitlab-ci.yml
 	sed -E -i '' "s#(&dp3_env) placeholder_env#\1 $(DEPLOY_ENV)#" .gitlab-ci.yml
 	@git --no-pager diff .gitlab-ci.yml
-	@echo "Please make sure to commit the changes in .gitlab-ci.yml in order to have Gitlab deploy $(GIT_BRANCH) to the Non-ATO $(DEPLOY_ENV) environment."
+	@echo "Please make sure to commit the changes in .gitlab-ci.yml in order to have CircleCI deploy $(GIT_BRANCH) to the Non-ATO $(DEPLOY_ENV) environment."
 
 .PHONY: nonato_gitlab_deploy_restore
 nonato_gitlab_deploy_restore:  ## Restore placeholders in config after deploy to a non-ATO env
@@ -1265,8 +1267,8 @@ nonato_gitlab_deploy_restore:  ## Restore placeholders in config after deploy to
 	sed -E -i '' "s#(&dp3_env) (exp|loadtest|demo)#\1 placeholder_env#" .gitlab-ci.yml
 
 #
-# ----- END NON-ATO DEPLOYMENT GITLAB TARGETS -----
-
+# ----- END NON-ATO DEPLOYMENT TARGETS -----
+#
 
 #
 # ----- START SETUP MULTI BRANCH -----

diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -1053,6 +1053,7 @@
 20241203024453_add_ppm_max_incentive_column.up.sql
 20241204155919_update_ordering_proc.up.sql
 20241204210208_retroactive_update_of_ppm_max_and_estimated_incentives_prd.up.sql
+20241209121924_entitlements_refactor.up.sql
 20241210143143_redefine_mto_shipment_audit_table.up.sql
 20241216170325_update_nts_enum_name.up.sql
 20241216190428_update_get_zip_code_function_and_update_pricing_proc.up.sql
@@ -1066,6 +1067,7 @@
 20241226173330_add_intl_param_values_to_service_params_table.up.sql
 20241227153723_remove_empty_string_emplid_values.up.sql
 20241227202424_insert_transportation_offices_camp_pendelton.up.sql
+20241230150644_student_travel_weight_limit_param.up.sql
 20241230190638_remove_AK_zips_from_zip3.up.sql
 20241230190647_add_missing_AK_zips_to_zip3_distances.up.sql
 20250103180420_update_pricing_proc_to_use_local_price_variable.up.sql