Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INT B-22264 #14689

Open
wants to merge 23 commits into
base: integrationTesting
Choose a base branch
from
Open

INT B-22264 #14689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
81cb788
Merge main into B-21974
brianmanley-caci Jan 27, 2025
0628310
Merge branch 'main' into MAIN-B-21974
brianmanley-caci Jan 27, 2025
2197bf6
turning on gitlab
JacintaCallahan Jan 27, 2025
9be9068
Merge branch 'main' into B-21544-Prime-Successful-Update-Message-MAIN
KonstanceH Jan 27, 2025
e907969
updating tests from int
KonstanceH Jan 27, 2025
293250e
add orders string change
KonstanceH Jan 27, 2025
1b6c912
fix whitespace in make
josiahzimmerman-caci Jan 27, 2025
38ec456
turning on gitlab
JacintaCallahan Jan 27, 2025
24674a9
Merge pull request #14662 from transcom/MAIN-B-21974
brianmanley-caci Jan 27, 2025
f16688d
Merge branch 'main' into B-21544-Prime-Successful-Update-Message-MAIN
KonstanceH Jan 27, 2025
0dcece4
fix whitespace in make
josiahzimmerman-caci Jan 27, 2025
52ff3a7
Merge branch 'main' into B-22274-turn-on-gitlab-all-deploys
josiahzimmerman-caci Jan 27, 2025
39d4efb
pre-commit test
josiahzimmerman-caci Jan 27, 2025
e8586a8
Merge pull request #14668 from transcom/B-22274-turn-on-gitlab-all-de…
josiahzimmerman-caci Jan 27, 2025
a9619b3
Merge branch 'main' into B-21544-Prime-Successful-Update-Message-MAIN
KonstanceH Jan 27, 2025
80ee0c1
Merge pull request #14632 from transcom/B-21544-Prime-Successful-Upda…
WeatherfordAaron Jan 28, 2025
c665a01
updated gitlab yml with otel
JacintaCallahan Jan 28, 2025
45c6c92
change test to move.mil for staging/prod
josiahzimmerman-caci Jan 28, 2025
1484323
Merge pull request #14677 from transcom/B-22274B-Rollback-Otel-Dockerhub
deandreJones Jan 28, 2025
6a51904
Merge remote-tracking branch 'origin/main' into B-21569
stevengleason-caci Jan 28, 2025
0b4d856
Merge pull request #14683 from transcom/B-21569
brianmanley-caci Jan 29, 2025
bab5e3b
adding POEFSC and PODFSC to weight billed lookup and picking minimum
danieljordan-caci Jan 29, 2025
bac1c90
Merge remote-tracking branch 'origin/MAIN-B-22264' into INT-B-22264
danieljordan-caci Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2656,7 +2656,7 @@ workflows:
- integration_tests_mtls
filters:
branches:
only: main
only: nolonger_main

- deploy_stg_migrations:
requires:
Expand Down
87 changes: 44 additions & 43 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"'
Expand Down Expand Up @@ -241,6 +241,7 @@ stages:
export OKTA_OFFICE_GROUP_ID=notrealgroupId
export OKTA_CUSTOMER_GROUP_ID=notrealcustomergroupId

#
# .setup_host_intergration_tests: &setup_host_intergration_tests
# - echo "Setting up /etc/hosts for local domain simulation"
# - echo "127.0.0.1 milmovelocal" | sudo tee -a /etc/hosts
Expand Down Expand Up @@ -1192,17 +1193,17 @@ 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 Amazon ECR with Crane..."
- aws ecr get-login-password --region ${AWS_REGION} | crane auth login ${ECR_REPOSITORY_URI} -u AWS --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 the public registry with Crane..."
- crane pull --insecure public.ecr.aws/aws-observability/aws-otel-collector:v0.31.0 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 "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
Expand Down Expand Up @@ -1447,17 +1448,17 @@ 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 Amazon ECR with Crane..."
- aws ecr get-login-password --region ${AWS_REGION} | crane auth login ${ECR_REPOSITORY_URI} -u AWS --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 the public registry with Crane..."
- crane pull --insecure public.ecr.aws/aws-observability/aws-otel-collector:v0.31.0 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 "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
Expand Down Expand Up @@ -1553,11 +1554,11 @@ deploy_app_client_tls_stg:
- ./scripts/ecs-deploy-service-container app-client-tls "${ECR_REPOSITORY_URI}/app@${ECR_DIGEST}" "${APP_ENVIRONMENT}" "/bin/milmove serve"
#TODO: fix domain make dynamic and pass in preferred
- echo "Running Health Check"
- bin/health-checker --schemes https --hosts api.$APP_ENVIRONMENT.dp3.us --key ${TLS_KEY} --cert ${TLS_CERT} --ca ${TLS_CA} --tries 10 --backoff 3 --log-level info --timeout 5m
- bin/health-checker --schemes https --hosts api.$APP_ENVIRONMENT.move.mil --key ${TLS_KEY} --cert ${TLS_CERT} --ca ${TLS_CA} --tries 10 --backoff 3 --log-level info --timeout 5m
- echo "Running TLS Check"
- bin/tls-checker --schemes https --hosts api.$APP_ENVIRONMENT.dp3.us --key ${TLS_KEY} --cert ${TLS_CERT} --ca ${TLS_CA} --log-level info --timeout 15m
- bin/tls-checker --schemes https --hosts api.$APP_ENVIRONMENT.move.mil --key ${TLS_KEY} --cert ${TLS_CERT} --ca ${TLS_CA} --log-level info --timeout 15m
- echo "Checking deployed commits"
- ./scripts/check-deployed-commit "api.$APP_ENVIRONMENT.dp3.us" "$CI_COMMIT_SHA" ${TLS_KEY} ${TLS_CERT} ${TLS_CA}
- ./scripts/check-deployed-commit "api.$APP_ENVIRONMENT.move.mil" "$CI_COMMIT_SHA" ${TLS_KEY} ${TLS_CERT} ${TLS_CA}
after_script:
- *announce_failure
rules:
Expand Down Expand Up @@ -1604,11 +1605,11 @@ deploy_app_stg:
- ./scripts/ecs-deploy-service-container app "${ECR_REPOSITORY_URI}/app@${ECR_DIGEST}" "${APP_ENVIRONMENT}" "/bin/milmove serve"
#TODO: fix domain make dynamic and pass in preferred
- echo "Running Health Check"
- bin/health-checker --schemes https --hosts my.$APP_ENVIRONMENT.dp3.us,office.$APP_ENVIRONMENT.dp3.us,admin.$APP_ENVIRONMENT.dp3.us --tries 10 --backoff 3 --log-level info --timeout 5m
- bin/health-checker --schemes https --hosts my.$APP_ENVIRONMENT.move.mil,office.$APP_ENVIRONMENT.move.mil,admin.$APP_ENVIRONMENT.move.mil --tries 10 --backoff 3 --log-level info --timeout 5m
- echo "Running TLS Check"
- bin/tls-checker --schemes https --hosts my.$APP_ENVIRONMENT.dp3.us,office.$APP_ENVIRONMENT.dp3.us,admin.$APP_ENVIRONMENT.dp3.us --log-level info --timeout 15m
- bin/tls-checker --schemes https --hosts my.$APP_ENVIRONMENT.move.mil,office.$APP_ENVIRONMENT.move.mil,admin.$APP_ENVIRONMENT.move.mil --log-level info --timeout 15m
- echo "Checking deployed commits"
- ./scripts/check-deployed-commit "my.$APP_ENVIRONMENT.dp3.us,office.$APP_ENVIRONMENT.dp3.us,admin.$APP_ENVIRONMENT.dp3.us" "$CI_COMMIT_SHA"
- ./scripts/check-deployed-commit "my.$APP_ENVIRONMENT.move.mil,office.$APP_ENVIRONMENT.move.mil,admin.$APP_ENVIRONMENT.move.mil" "$CI_COMMIT_SHA"
after_script:
- *announce_failure
rules:
Expand Down Expand Up @@ -1720,17 +1721,17 @@ 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 Amazon ECR with Crane..."
- aws ecr get-login-password --region ${AWS_REGION} | crane auth login ${ECR_REPOSITORY_URI} -u AWS --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 the public registry with Crane..."
- crane pull --insecure public.ecr.aws/aws-observability/aws-otel-collector:v0.31.0 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 "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
Expand Down Expand Up @@ -1828,11 +1829,11 @@ deploy_app_client_tls_prd:
- ./scripts/ecs-deploy-service-container app-client-tls "${ECR_REPOSITORY_URI}/app@${ECR_DIGEST}" "${APP_ENVIRONMENT}" "/bin/milmove serve"
#TODO: fix domain make dynamic and pass in preferred
- echo "Running Health Check"
- bin/health-checker --schemes https --hosts api.$APP_ENVIRONMENT.dp3.us --key ${TLS_KEY} --cert ${TLS_CERT} --ca ${TLS_CA} --tries 10 --backoff 3 --log-level info --timeout 5m
- bin/health-checker --schemes https --hosts api.$APP_ENVIRONMENT.move.mil --key ${TLS_KEY} --cert ${TLS_CERT} --ca ${TLS_CA} --tries 10 --backoff 3 --log-level info --timeout 5m
- echo "Running TLS Check"
- bin/tls-checker --schemes https --hosts api.$APP_ENVIRONMENT.dp3.us --key ${TLS_KEY} --cert ${TLS_CERT} --ca ${TLS_CA} --log-level info --timeout 15m
- bin/tls-checker --schemes https --hosts api.$APP_ENVIRONMENT.move.mil --key ${TLS_KEY} --cert ${TLS_CERT} --ca ${TLS_CA} --log-level info --timeout 15m
- echo "Checking deployed commits"
- ./scripts/check-deployed-commit "api.$APP_ENVIRONMENT.dp3.us" "$CI_COMMIT_SHA" ${TLS_KEY} ${TLS_CERT} ${TLS_CA}
- ./scripts/check-deployed-commit "api.$APP_ENVIRONMENT.move.mil" "$CI_COMMIT_SHA" ${TLS_KEY} ${TLS_CERT} ${TLS_CA}
after_script:
- *announce_failure
rules:
Expand Down Expand Up @@ -1879,11 +1880,11 @@ deploy_app_prd:
- ./scripts/ecs-deploy-service-container app "${ECR_REPOSITORY_URI}/app@${ECR_DIGEST}" "${APP_ENVIRONMENT}" "/bin/milmove serve"
#TODO: fix domain make dynamic and pass in preferred
- echo "Running Health Check"
- bin/health-checker --schemes https --hosts my.$APP_ENVIRONMENT.dp3.us,office.$APP_ENVIRONMENT.dp3.us,admin.$APP_ENVIRONMENT.dp3.us --tries 10 --backoff 3 --log-level info --timeout 5m
- bin/health-checker --schemes https --hosts my.$APP_ENVIRONMENT.move.mil,office.$APP_ENVIRONMENT.move.mil,admin.$APP_ENVIRONMENT.move.mil --tries 10 --backoff 3 --log-level info --timeout 5m
- echo "Running TLS Check"
- bin/tls-checker --schemes https --hosts my.$APP_ENVIRONMENT.dp3.us,office.$APP_ENVIRONMENT.dp3.us,admin.$APP_ENVIRONMENT.dp3.us --log-level info --timeout 15m
- bin/tls-checker --schemes https --hosts my.$APP_ENVIRONMENT.move.mil,office.$APP_ENVIRONMENT.move.mil,admin.$APP_ENVIRONMENT.move.mil --log-level info --timeout 15m
- echo "Checking deployed commits"
- ./scripts/check-deployed-commit "my.$APP_ENVIRONMENT.dp3.us,office.$APP_ENVIRONMENT.dp3.us,admin.$APP_ENVIRONMENT.dp3.us" "$CI_COMMIT_SHA"
- ./scripts/check-deployed-commit "my.$APP_ENVIRONMENT.move.mil,office.$APP_ENVIRONMENT.move.mil,admin.$APP_ENVIRONMENT.move.mil" "$CI_COMMIT_SHA"
after_script:
- *announce_failure
rules:
Expand Down
38 changes: 38 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,44 @@ nonato_deploy_restore: ## Restore placeholders in config after deploy to a non-
# ----- END NON-ATO DEPLOYMENT TARGETS -----
#


#
# ----- START NON-ATO DEPLOYMENT TARGETS -----
#

.PHONY: nonato_gitlab_deploy_prepare
nonato_gitlab_deploy_prepare: ## Replace placeholders in config to deploy to a non-ATO env. Requires DEPLOY_ENV to be set to exp, loadtest, or demo.
ifeq ($(DEPLOY_ENV), exp)
@echo "Preparing for deploy to experimental"
else ifeq ($(DEPLOY_ENV), loadtest)
@echo "Preparing for deploy to loadtest"
else ifeq ($(DEPLOY_ENV), demo)
@echo "Preparing for deploy to demo"
else
$(error DEPLOY_ENV must be exp, loadtest, or demo)
endif
sed -E -i '' "s#(&dp3_branch) placeholder_branch_name#\1 $(GIT_BRANCH)#" .gitlab-ci.yml
sed -E -i '' "s#(&integration_ignore_branch) placeholder_branch_name#\1 $(GIT_BRANCH)#" .gitlab-ci.yml
sed -E -i '' "s#(&integration_mtls_ignore_branch) placeholder_branch_name#\1 $(GIT_BRANCH)#" .gitlab-ci.yml
sed -E -i '' "s#(&client_ignore_branch) placeholder_branch_name#\1 $(GIT_BRANCH)#" .gitlab-ci.yml
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 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
sed -E -i '' "s#(&dp3_branch) $(GIT_BRANCH)#\1 placeholder_branch_name#" .gitlab-ci.yml
sed -E -i '' "s#(&integration_ignore_branch) $(GIT_BRANCH)#\1 placeholder_branch_name#" .gitlab-ci.yml
sed -E -i '' "s#(&integration_mtls_ignore_branch) $(GIT_BRANCH)#\1 placeholder_branch_name#" .gitlab-ci.yml
sed -E -i '' "s#(&client_ignore_branch) $(GIT_BRANCH)#\1 placeholder_branch_name#" .gitlab-ci.yml
sed -E -i '' "s#(&server_ignore_branch) $(GIT_BRANCH)#\1 placeholder_branch_name#" .gitlab-ci.yml
sed -E -i '' "s#(&dp3_env) (exp|loadtest|demo)#\1 placeholder_env#" .gitlab-ci.yml

#
# ----- END NON-ATO DEPLOYMENT TARGETS -----
#

#
# ----- START SETUP MULTI BRANCH -----
#
Expand Down
19 changes: 10 additions & 9 deletions pkg/payment_request/service_param_value_lookups/weight_billed_lookup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,13 @@ func applyMinimum(code models.ReServiceCode, shipmentType models.MTOShipmentType
switch shipmentType {
case models.MTOShipmentTypeUnaccompaniedBaggage:
switch code {
case models.ReServiceCodeIOSHUT,
models.ReServiceCodeIDSHUT:
case models.ReServiceCodeUBP,
models.ReServiceCodeIUBPK,
models.ReServiceCodeIUBUPK,
models.ReServiceCodeIOSHUT,
models.ReServiceCodeIDSHUT,
models.ReServiceCodePODFSC,
models.ReServiceCodePOEFSC:
if weight < 300 {
result = 300
}
Expand Down Expand Up @@ -238,16 +243,12 @@ func applyMinimum(code models.ReServiceCode, shipmentType models.MTOShipmentType
models.ReServiceCodeIDDSIT,
models.ReServiceCodeIOSHUT,
models.ReServiceCodeIDSHUT,
models.ReServiceCodeFSC:
models.ReServiceCodeFSC,
models.ReServiceCodePODFSC,
models.ReServiceCodePOEFSC:
if weight < 500 {
result = 500
}
case models.ReServiceCodeUBP,
models.ReServiceCodeIUBPK,
models.ReServiceCodeIUBUPK:
if weight < 300 {
result = 300
}
}
}
return fmt.Sprintf("%d", result)
Expand Down
14 changes: 7 additions & 7 deletions pkg/payment_request/service_param_value_lookups/weight_billed_lookup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ func (suite *ServiceParamValueLookupsSuite) TestWeightBilledLookup() {
{models.ReServiceCodeDDDSIT, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
// International
{models.ReServiceCodeISLH, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
{models.ReServiceCodeUBP, unit.Pound(250), "300", models.MTOShipmentTypeHHG},
{models.ReServiceCodeISLH, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
{models.ReServiceCodeUBP, unit.Pound(250), "300", models.MTOShipmentTypeHHG},
{models.ReServiceCodeISLH, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
{models.ReServiceCodeUBP, unit.Pound(250), "300", models.MTOShipmentTypeHHG},
{models.ReServiceCodeIHPK, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
{models.ReServiceCodeIHUPK, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
{models.ReServiceCodeIUBPK, unit.Pound(250), "300", models.MTOShipmentTypeHHG},
{models.ReServiceCodeIUBUPK, unit.Pound(250), "300", models.MTOShipmentTypeHHG},
{models.ReServiceCodePOEFSC, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
{models.ReServiceCodePODFSC, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
{models.ReServiceCodeUBP, unit.Pound(250), "300", models.MTOShipmentTypeUnaccompaniedBaggage},
{models.ReServiceCodeIUBPK, unit.Pound(250), "300", models.MTOShipmentTypeUnaccompaniedBaggage},
{models.ReServiceCodeIUBUPK, unit.Pound(250), "300", models.MTOShipmentTypeUnaccompaniedBaggage},
{models.ReServiceCodePOEFSC, unit.Pound(250), "300", models.MTOShipmentTypeUnaccompaniedBaggage},
{models.ReServiceCodePODFSC, unit.Pound(250), "300", models.MTOShipmentTypeUnaccompaniedBaggage},
// International SIT
{models.ReServiceCodeIOFSIT, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
{models.ReServiceCodeIDFSIT, unit.Pound(450), "500", models.MTOShipmentTypeHHG},
Expand Down