Merge branch 'B-22301-main' into B-22301-int

transcom · Feb 17, 2025 · 90fe4ea · 90fe4ea
2 parents 47ef8a9 + a035e2e
commit 90fe4ea
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 9 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -152,7 +152,7 @@ stages:
   #build off prd variables
   - export ECR_REPOSITORY_URI=${PRD_ACCOUNT_ID}.dkr.ecr.${PRD_REGION}.amazonaws.com
   - export APP_DOCKER_FILE=Dockerfile
-  - export TASK_DOCKER_FILE=Dockerfile
+  - export TASK_DOCKER_FILE=Dockerfile.tasks
   #TODO: update exp to prod
   - export APP_ENVIRONMENT=prd
 

diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go
diff --git a/scripts/rds-snapshot-app-db b/scripts/rds-snapshot-app-db
@@ -19,17 +19,35 @@ db_snapshot_identifier=$db_instance_identifier-$(date +%s)
 readonly db_snapshot_identifier
 readonly tags=("Key=Environment,Value=$environment" "Key=Tool,Value=$(basename "$0")")
 
+
 echo
 echo "Wait for concurrent database snapshots for ${db_instance_identifier} to complete before continuing ..."
-time aws rds wait db-snapshot-completed --cli-read-timeout 2100 --cli-connect-timeout 2100  --db-instance-identifier "$db_instance_identifier"
+time aws rds wait db-snapshot-completed  --db-instance-identifier "$db_instance_identifier"
+
 
 echo
 echo "Create database snapshot for ${db_instance_identifier} with identifier ${db_snapshot_identifier}"
-aws rds create-db-snapshot --cli-read-timeout 2100 --cli-connect-timeout 2100 --db-instance-identifier "$db_instance_identifier" --db-snapshot-identifier "$db_snapshot_identifier" --tags "${tags[@]}"
+
+
+aws rds create-db-snapshot --db-instance-identifier "$db_instance_identifier" --db-snapshot-identifier "$db_snapshot_identifier" --tags "${tags[@]}"
+
+#we want to loop while status is not available; check after initiating the create
+while true; do
+  db_description=$(aws rds describe-db-snapshots --db-snapshot-identifier "$db_snapshot_identifier")
+  db_status=$(echo "${db_description}" | jq -r ".DBSnapshots[].Status")
+  echo "${db_snapshot_identifier} -- ${db_status}"
+  if [[ "${db_status}" == "available" ]]; then
+    break
+  fi
+  sleep 15
+done
+
+
+#unnecessary confirm but will leave in
 
 echo
 echo "Wait for current database snapshot ${db_snapshot_identifier} to complete before continuing ..."
-time aws rds wait db-snapshot-completed --cli-read-timeout 2100 --cli-connect-timeout 2100  --db-snapshot-identifier "$db_snapshot_identifier"
+time aws rds wait db-snapshot-completed  --db-snapshot-identifier "$db_snapshot_identifier"
 
 echo
 echo "Describe the database snapshot ${db_snapshot_identifier}"

diff --git a/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx b/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx
@@ -46,13 +46,20 @@ let validationShape = {
   secondaryDestinationAddress: Yup.object().shape({
     address: OptionalAddressSchema,
   }),
+  tertiaryPickupAddress: Yup.object().shape({
+    address: OptionalAddressSchema,
+  }),
+  tertiaryDestinationAddress: Yup.object().shape({
+    address: OptionalAddressSchema,
+  }),
 };
 
 const DateAndLocationForm = ({ mtoShipment, destinationDutyLocation, serviceMember, move, onBack, onSubmit }) => {
   const initialValues = {
     useCurrentResidence: false,
     pickupAddress: {},
     secondaryPickupAddress: {},
+    tertiaryPickupAddress: {},
     hasSecondaryPickupAddress: mtoShipment?.ppmShipment?.secondaryPickupAddress ? 'true' : 'false',
     hasTertiaryPickupAddress: mtoShipment?.ppmShipment?.tertiaryPickupAddress ? 'true' : 'false',
     useCurrentDestinationAddress: false,
@@ -63,7 +70,6 @@ const DateAndLocationForm = ({ mtoShipment, destinationDutyLocation, serviceMemb
     sitExpected: mtoShipment?.ppmShipment?.sitExpected ? 'true' : 'false',
     expectedDepartureDate: mtoShipment?.ppmShipment?.expectedDepartureDate || '',
     closeoutOffice: move?.closeoutOffice || {},
-    tertiaryPickupAddress: {},
     tertiaryDestinationAddress: {},
   };
 

diff --git a/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.test.jsx b/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.test.jsx
@@ -184,7 +184,6 @@ describe('DateAndLocationForm component', () => {
           <DateAndLocationForm {...defaultProps} />
         </Provider>,
       );
-      await userEvent.click(screen.getByLabelText('Use my current delivery address'));
       const postalCodes = screen.getAllByTestId(/ZIP/);
       const address1 = screen.getAllByLabelText(/Address 1/, { exact: false });
       const address2 = screen.getAllByLabelText('Address 2', { exact: false });

diff --git a/swagger-def/ghc.yaml b/swagger-def/ghc.yaml
@@ -4323,7 +4323,7 @@ paths:
       produces:
         - application/json
       responses:
-        '200':
+        "200":
           description: Successfully retrieved counseling offices
           schema:
             $ref: '#/definitions/CounselingOffices'