merging current integration branch

.circleci/config.yml

@@ -746,6 +746,7 @@ commands:
             export OKTA_TENANT_ORG_URL=test-milmove.okta.mil
             export OKTA_API_KEY=notrealapikey
             export OKTA_OFFICE_GROUP_ID=notrealgroupId
+            export OKTA_CUSTOMER_GROUP_ID=notrealcustomergroupId
 
 
             make server_test
@@ -777,6 +778,7 @@ commands:
             OKTA_OFFICE_CLIENT_ID: 9f9f9s8s90gig9
             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
@@ -845,6 +847,7 @@ commands:
             export OKTA_TENANT_ORG_URL=test-milmove.okta.mil
             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
@@ -954,6 +957,7 @@ commands:
             export OKTA_TENANT_ORG_URL=test-milmove.okta.mil
             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
@@ -1041,6 +1045,7 @@ commands:
             export OKTA_TENANT_ORG_URL=test-milmove.okta.mil
             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

@@ -137,6 +137,7 @@ require OKTA_API_KEY "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1
 require OKTA_CUSTOMER_SECRET_KEY "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal okta_customer_secret_key'"
 require OKTA_CUSTOMER_CLIENT_ID "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal okta_customer_client_id'"
 require OKTA_CUSTOMER_CALLBACK_URL "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal okta_customer_callback_url'"
+require OKTA_CUSTOMER_GROUP_ID "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal okta_customer_group_id'"
 
 # Office
 require OKTA_OFFICE_SECRET_KEY "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal okta_office_secret_key'"

migrations/app/migrations_manifest.txt

@@ -913,3 +913,4 @@
 20240227180121_add_status_edipi_other_unique_id_and_rej_reason_to_office_users_table.up.sql
 20240229203552_add_to_ppm_advance_status_datatype.up.sql
 20240308181906_add_has_secondary_pickup_address_and_has_secondary_delivery_address_to_ppm_shipments.up.sql
+20240319214733_remove_sit_authorized_end_date.up.sql

migrations/app/schema/20240319214733_remove_sit_authorized_end_date.up.sql

@@ -0,0 +1 @@
+ALTER TABLE mto_service_items DROP COLUMN IF EXISTS sit_authorized_end_date;

pkg/apperror/errors.go

@@ -75,6 +75,35 @@ func (e *NotFoundError) Unwrap() error {
 	return e.err
 }
 
+// UpdateError is returned when a service cannot be updated
+type UpdateError struct {
+	id      uuid.UUID
+	message string
+	err     error
+}
+
+// NewUpdateError returns an error for when a service cannot be updated
+func NewUpdateError(id uuid.UUID, message string) UpdateError {
+	return UpdateError{
+		id:      id,
+		message: message,
+	}
+}
+
+func (e UpdateError) Error() string {
+	return fmt.Sprintf("Update Error %s", e.message)
+}
+
+// Wrap lets the caller add an error to be wrapped in the NewUpdateError
+func (e *UpdateError) Wrap(err error) {
+	e.err = err
+}
+
+// Unwrap returns the wrapped error, could be nil
+func (e *UpdateError) Unwrap() error {
+	return e.err
+}
+
 type PPMNotReadyForCloseoutError struct {
 	id      uuid.UUID
 	message string

pkg/cli/auth.go

@@ -86,8 +86,9 @@ const (
 	// RA Validator: [email protected]
 	// RA Modified Severity: CAT III
 	// #nosec G101
-	OktaAdminSecretKeyFlag string = "okta-admin-secret-key"
-	OktaOfficeGroupIDFlag  string = "okta-office-group-id"
+	OktaAdminSecretKeyFlag  string = "okta-admin-secret-key"
+	OktaOfficeGroupIDFlag   string = "okta-office-group-id"
+	OktaCustomerGroupIDFlag string = "okta-customer-group-id"
 )
 
 // InitAuthFlags initializes Auth command line flags
@@ -108,6 +109,7 @@ func InitAuthFlags(flag *pflag.FlagSet) {
 	flag.String(OktaAdminCallbackURL, "", "The callback URL from logging in to the admin Okta app back to MilMove.")
 	flag.String(OktaAdminSecretKeyFlag, "", "The secret key for the miltiary Admin app, aka 'my'.")
 	flag.String(OktaOfficeGroupIDFlag, "", "The office group id for the Office app, aka 'office'.")
+	flag.String(OktaCustomerGroupIDFlag, "", "The customer group id for the Customer app.")
 }
 
 // CheckAuth validates Auth command line flags
@@ -136,6 +138,7 @@ func CheckAuth(v *viper.Viper) error {
 
 	groupIDVars := []string{
 		OktaOfficeGroupIDFlag,
+		OktaCustomerGroupIDFlag,
 	}
 
 	for _, c := range clientIDVars {

pkg/gen/ghcapi/configure_mymove.go

@@ -102,6 +102,11 @@ func configureAPI(api *ghcoperations.MymoveAPI) http.Handler {
 			return middleware.NotImplemented("operation customer_support_remarks.CreateCustomerSupportRemarkForMove has not yet been implemented")
 		})
 	}
+	if api.CustomerCreateCustomerWithOktaOptionHandler == nil {
+		api.CustomerCreateCustomerWithOktaOptionHandler = customer.CreateCustomerWithOktaOptionHandlerFunc(func(params customer.CreateCustomerWithOktaOptionParams) middleware.Responder {
+			return middleware.NotImplemented("operation customer.CreateCustomerWithOktaOption has not yet been implemented")
+		})
+	}
 	if api.EvaluationReportsCreateEvaluationReportHandler == nil {
 		api.EvaluationReportsCreateEvaluationReportHandler = evaluation_reports.CreateEvaluationReportHandlerFunc(func(params evaluation_reports.CreateEvaluationReportParams) middleware.Responder {
 			return middleware.NotImplemented("operation evaluation_reports.CreateEvaluationReport has not yet been implemented")