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.

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

set to deploy to loatest #13768

Draft
wants to merge 4,683 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4683 commits
Select commit Hold shift + click to select a range
ce1423e
added address update to test
danieljordan-caci Feb 6, 2025
1ba21f8
Merge remote-tracking branch 'origin/MAIN-B-22272' into INT-B-22272
danieljordan-caci Feb 6, 2025
003abce
Merge branch 'main' into B-21961-Add-Roles-To-Requested-Office-Users-…
TevinAdams Feb 6, 2025
1da01b9
Adding additional test coverage
TevinAdams Feb 6, 2025
53f6e1c
Merge branch 'Merge branch 'B-21961-Add-Roles-To-Requested-Office-Use…
TevinAdams Feb 6, 2025
7e767f6
initial commit, leggo
danieljordan-caci Feb 6, 2025
8d739e4
Added back in nil checks and added tests.
brooklyn-welsh Feb 6, 2025
1e9ee0f
Merge branch 'integrationTesting' into INT-B-21094
brooklyn-welsh Feb 6, 2025
35d45ae
B-21943 - update test comments, additional base case check for valida…
ryan-mchugh Feb 6, 2025
b034c32
Merge branch 'MAIN-B-21943-prime_sim_resubmit_sit' into INT-B-21943-p…
ryan-mchugh Feb 6, 2025
1c5dc88
Merge branch 'integrationTesting' of github.com:transcom/mymove into …
ryan-mchugh Feb 6, 2025
d53fe96
Query adjustment
TevinAdams Feb 6, 2025
d4735ed
Merge branch 'B-21961-Add-Roles-To-Requested-Office-Users-List-Sortin…
TevinAdams Feb 6, 2025
c445e78
initial commit, migration added
danieljordan-caci Feb 6, 2025
cad2dd6
Merge remote-tracking branch 'origin/MAIN-B-21982' into INT-B-21982
danieljordan-caci Feb 6, 2025
a2d7db1
Merge remote-tracking branch 'origin/B-21935' into B-21935-int
deandreJones Feb 6, 2025
c1a84b8
Merge pull request #14762 from transcom/B-21935-int
deandreJones Feb 6, 2025
f000e68
Merge branch 'integrationTesting' into B-22233-INT
r-mettler Feb 6, 2025
6b107d0
Merge branch 'integrationTesting' into B-21339-int
JonSpight Feb 6, 2025
78c147c
Merge branch 'integrationTesting' into INT-B-22020-TIO-payment-reques…
taeJungCaci Feb 6, 2025
06502ae
Merge branch 'integrationTesting' into B-21438-INT
CoryKleinjanCACI Feb 6, 2025
03d1ffb
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Feb 6, 2025
3b256d4
Merge branch 'integrationTesting' into B-21439-INT
CoryKleinjanCACI Feb 6, 2025
1433351
Merge branch 'integrationTesting' into B-21440-INT
CoryKleinjanCACI Feb 6, 2025
7a6869f
Merge pull request #14691 from transcom/B-22233-INT
ajlusk Feb 6, 2025
a8bb3d1
Merge branch 'integrationTesting' into B-21438-INT
CoryKleinjanCACI Feb 6, 2025
6ab54ce
Merge branch 'integrationTesting' into B-21439-INT
CoryKleinjanCACI Feb 6, 2025
2541702
Merge branch 'integrationTesting' into B-21440-INT
CoryKleinjanCACI Feb 6, 2025
cb112e0
Merge branch 'integrationTesting' into INT-B-21423-Prime-Int-SIT-Serv…
MInthavongsay Feb 6, 2025
2c588d6
Merge branch 'integrationTesting' into B-21339-int
JonSpight Feb 6, 2025
039539f
Merge pull request #14743 from transcom/B-21378-issue-fix-iUB-RDD-Tra…
TevinAdams Feb 6, 2025
3b6135d
Merge branch 'integrationTesting' into INT-B-22015
antgmann Feb 6, 2025
1303557
Merge branch 'integrationTesting' into B-21339-int
JonSpight Feb 6, 2025
fda56f2
Merge branch 'integrationTesting' into INT-B-21423-Prime-Int-SIT-Serv…
ajlusk Feb 6, 2025
3a48b3e
Merge branch 'integrationTesting' into B-22305-INT-Milmove-Error-mess…
joeydoyecaci Feb 6, 2025
73d16a4
Merge branch 'integrationTesting' into B-22368-INT
paulstonebraker Feb 6, 2025
c51a937
Merge branch 'main' into B-22305-MAIN-Milmove-Error-message-has-incor…
joeydoyecaci Feb 6, 2025
e64f3ac
Merge pull request #14585 from transcom/B-21339-int
JonSpight Feb 6, 2025
4a5ca07
Merge branch 'integrationTesting' into B-22247-INT2
paulstonebraker Feb 6, 2025
d994e15
Merge branch 'integrationTesting' into B-22368-INT
paulstonebraker Feb 6, 2025
d0d7716
Rework
JonSpight Feb 6, 2025
e19e11c
added frontend work for intl crating and uncrating payment request
taeJungCaci Feb 6, 2025
d403e01
Merge branch 'MAIN-B-21416-intl-crating-TIO-update-for-payment-reques…
taeJungCaci Feb 6, 2025
13df2cb
Merge branch 'integrationTesting' into INT-B-22020-TIO-payment-reques…
taeJungCaci Feb 6, 2025
97ef918
Merge branch 'B-22301-main' into B-22301-int
JonSpight Feb 6, 2025
74008ae
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Feb 7, 2025
0e9fce6
Export implementation complete
TevinAdams Feb 7, 2025
04fb88b
Merge branch 'B-21962-Create-Requested-Users-Report' into B-21962-Cre…
TevinAdams Feb 7, 2025
27160b6
Merge branch 'integrationTesting' into INT-B-21423-Prime-Int-SIT-Serv…
ajlusk Feb 7, 2025
c589983
Merge pull request #14753 from transcom/B-22247-INT2
paulstonebraker Feb 7, 2025
c78cfd4
Merge branch 'integrationTesting' into INT-B-22015
antgmann Feb 7, 2025
51e8f27
Merge branch 'integrationTesting' into B-21438-INT
CoryKleinjanCACI Feb 7, 2025
1d0fc6e
Merge branch 'integrationTesting' into B-21439-INT
CoryKleinjanCACI Feb 7, 2025
a1eb2a9
Merge branch 'integrationTesting' into B-21440-INT
CoryKleinjanCACI Feb 7, 2025
b6786fb
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Feb 7, 2025
1d8dfd5
Merge branch 'integrationTesting' into INT-B-22020-TIO-payment-reques…
taeJungCaci Feb 7, 2025
bb8fecd
Merge pull request #14687 from transcom/B-21438-INT
CoryKleinjanCACI Feb 7, 2025
0af1379
Merge branch 'integrationTesting' into INT-B-22015
antgmann Feb 7, 2025
ffc742a
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Feb 7, 2025
ce37af9
Merge branch 'integrationTesting' into INT-B-22020-TIO-payment-reques…
taeJungCaci Feb 7, 2025
5e9a088
Merge branch 'main' into B-22305-MAIN-Milmove-Error-message-has-incor…
joeydoyecaci Feb 7, 2025
d916261
Merge branch 'integrationTesting' into B-22305-INT-Milmove-Error-mess…
joeydoyecaci Feb 7, 2025
7836c55
Merge pull request #14761 from transcom/INT-B-21982
danieljordan-caci Feb 7, 2025
da04f65
Merge branch 'integrationTesting' into INT-B-22020-TIO-payment-reques…
taeJungCaci Feb 7, 2025
7dbc06b
Merge branch 'integrationTesting' into B-21439-INT
CoryKleinjanCACI Feb 7, 2025
6a3c990
Merge branch 'integrationTesting' into B-21439-INT
CoryKleinjanCACI Feb 7, 2025
4fedc40
query improvements, updating csv file name prefix
danieljordan-caci Feb 7, 2025
5041827
Merge branch 'integrationTesting' into B-21440-INT
CoryKleinjanCACI Feb 7, 2025
4cb1c60
merge conflict resolution
antgmann Feb 7, 2025
a92e94f
updating comment
CoryKleinjanCACI Feb 7, 2025
3ef8599
Merge branch 'integrationTesting' into B-21440-INT
CoryKleinjanCACI Feb 7, 2025
174f5b4
Merge branch 'B-21439-MAIN' into B-21440-MAIN
CoryKleinjanCACI Feb 7, 2025
aaff6e6
Merge branch 'B-21440-MAIN' into B-21440-INT
CoryKleinjanCACI Feb 7, 2025
9f91450
Adding tests
TevinAdams Feb 7, 2025
c3acd43
Merge branch 'B-21961-Add-Roles-To-Requested-Office-Users-List-Sortin…
TevinAdams Feb 7, 2025
7c09dbc
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Feb 7, 2025
a0b0c5c
added function for fetch_documents
r-mettler Feb 7, 2025
f4ce771
test adjustments
danieljordan-caci Feb 7, 2025
167cd9a
use fetch_documents db function
r-mettler Feb 7, 2025
d5b7e87
Merge remote-tracking branch 'origin/MAIN-B-22272' into INT-B-22272
danieljordan-caci Feb 7, 2025
9aacc65
Merge branch 'integrationTesting' into INT-B-21939
danieljordan-caci Feb 7, 2025
8a30392
Merge pull request #14720 from transcom/B-21439-INT
CoryKleinjanCACI Feb 7, 2025
42902a7
Merge branch 'integrationTesting' into INT-B-22015
antgmann Feb 7, 2025
096b891
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Feb 7, 2025
f206695
Merge branch 'integrationTesting' into B-21440-INT
CoryKleinjanCACI Feb 7, 2025
2463eed
MAIN merge
MInthavongsay Feb 7, 2025
653b1d6
Merge branch 'INT-B-21423-Prime-Int-SIT-Service-Item' of github.com:t…
MInthavongsay Feb 7, 2025
0275008
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 7, 2025
fa14f0d
Merge pull request #14758 from transcom/INT-B-21939
danieljordan-caci Feb 7, 2025
7adabd7
Merge branch 'integrationTesting' into INT-B-22015
antgmann Feb 7, 2025
fab71bd
Merge branch 'integrationTesting' into B-21440-INT
CoryKleinjanCACI Feb 7, 2025
31e88bc
Merge branch 'main' of github.com:transcom/mymove into B-22307
r-mettler Feb 7, 2025
c1d8a92
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 7, 2025
b16c1d0
Merge branch 'integrationTesting' into INT-B-21943-prime_sim_resubmit…
brianmanley-caci Feb 7, 2025
8a4e5c4
merge INT
MInthavongsay Feb 7, 2025
e38c863
updating to include moves.show in return
danieljordan-caci Feb 7, 2025
06655b8
Merge remote-tracking branch 'origin/MAIN-B-22272' into INT-B-22272
danieljordan-caci Feb 7, 2025
bbc31c7
Merge pull request #14692 from transcom/INT-B-22015
antgmann Feb 7, 2025
0ab756c
Merge branch 'integrationTesting' into B-21440-INT
CoryKleinjanCACI Feb 7, 2025
4c8ff1f
Merge branch 'integrationTesting' into INT-B-21423-Prime-Int-SIT-Serv…
MInthavongsay Feb 7, 2025
4a0b322
Merge branch 'integrationTesting' into B-22368-INT
paulstonebraker Feb 7, 2025
69c2053
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 7, 2025
74d2fb5
Merge pull request #14741 from transcom/relaxed-outline-validation-int
cameroncaci Feb 7, 2025
410c3ce
Merge branch 'integrationTesting' into B-21440-INT
CoryKleinjanCACI Feb 7, 2025
3659078
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 7, 2025
6cd8c00
Merge branch 'integrationTesting' into B-22368-INT
paulstonebraker Feb 7, 2025
cdc4978
Merge pull request #14752 from transcom/INT-B-22272
danieljordan-caci Feb 7, 2025
54f8e8f
Merge branch 'integrationTesting' into B-21440-INT
CoryKleinjanCACI Feb 7, 2025
484817f
Merge branch 'integrationTesting' into INT-B-21423-Prime-Int-SIT-Serv…
MInthavongsay Feb 7, 2025
20e3518
close cursors, updated test
r-mettler Feb 7, 2025
72dd20b
Fixed 'mailto:' email link
joeydoyecaci Feb 7, 2025
cf06032
added tests
taeJungCaci Feb 7, 2025
2bbf777
Merge branch 'MAIN-B-22020-TIO-payment-request-calculations-BE' into …
taeJungCaci Feb 7, 2025
80dc47e
fix test
taeJungCaci Feb 7, 2025
feb5ad4
Merge branch 'MAIN-B-22020-TIO-payment-request-calculations-BE' into …
taeJungCaci Feb 7, 2025
ce32f0d
Merge pull request #14739 from transcom/B-21440-INT
r-mettler Feb 7, 2025
c9d2431
Merge branch 'integrationTesting' into INT-B-22020-TIO-payment-reques…
taeJungCaci Feb 7, 2025
1f78b92
Merge branch 'integrationTesting' into INT-B-21423-Prime-Int-SIT-Serv…
r-mettler Feb 7, 2025
dfe2ebf
Merge branch 'main' of github.com:transcom/mymove into B-22307
r-mettler Feb 7, 2025
7eb30eb
Merge branch 'B-22307' of github.com:transcom/mymove into B-22307-INT
r-mettler Feb 7, 2025
8bc1830
Merge branch 'integrationTesting' into B-22368-INT
paulstonebraker Feb 7, 2025
896e66e
Merge branch 'B-22305-MAIN-Milmove-Error-message-has-incorrect-URL-fo…
joeydoyecaci Feb 7, 2025
5d7a679
Merge branch 'integrationTesting' into B-22305-INT-Milmove-Error-mess…
joeydoyecaci Feb 7, 2025
640a05c
fix test
deandreJones Feb 7, 2025
543222d
Export adjustment
TevinAdams Feb 7, 2025
963e6fc
Preceeding address checks for non required address
JonSpight Feb 7, 2025
d678bda
Export adjustment
TevinAdams Feb 7, 2025
7b4c4d3
return correct error
r-mettler Feb 7, 2025
6377016
Merge branch 'main' of github.com:transcom/mymove into B-22307
r-mettler Feb 7, 2025
23fe934
Merge branch 'B-22307' of github.com:transcom/mymove into B-22307-INT
r-mettler Feb 7, 2025
57ff1c4
Merge pull request #14721 from transcom/INT-B-21943-prime_sim_resubmi…
brianmanley-caci Feb 7, 2025
b2f65aa
Merge pull request #14773 from transcom/B-21935-testFix
deandreJones Feb 7, 2025
1afff17
and a few more
deandreJones Feb 8, 2025
79ea5a6
Merge branch 'integrationTesting' into B-21935-testFix
deandreJones Feb 8, 2025
19b93e3
Merge pull request #14775 from transcom/B-21935-testFix
deandreJones Feb 10, 2025
dd66434
Merge remote-tracking branch 'origin/main' into MAIN-B-20984
brianmanley-caci Feb 10, 2025
5f7aee1
Merge pull request #14754 from transcom/B-21961-Add-Roles-To-Requeste…
TevinAdams Feb 10, 2025
58c16d2
Merge B-20984 into INT-B-20984
brianmanley-caci Feb 10, 2025
e8b8430
removing filter deleted, not needed
r-mettler Feb 10, 2025
45fa261
Merge branch 'integrationTesting' of github.com:transcom/mymove into …
r-mettler Feb 10, 2025
6158a27
Merge branch 'B-22307' of github.com:transcom/mymove into B-22307-INT
r-mettler Feb 10, 2025
f4143ad
INT merge
MInthavongsay Feb 10, 2025
5176167
Merge branch 'INT-B-21423-Prime-Int-SIT-Service-Item' of github.com:t…
MInthavongsay Feb 10, 2025
52f07c8
adding comments for cursor use
r-mettler Feb 10, 2025
bc77d91
Merge branch 'integrationTesting' into INT-B-22020-TIO-payment-reques…
taeJungCaci Feb 10, 2025
8674661
Merge remote-tracking branch 'origin/MAIN-B-22272' into MAIN-B-22451
danieljordan-caci Feb 10, 2025
9fd3372
Merge branch 'integrationTesting' into B-22305-INT-Milmove-Error-mess…
joeydoyecaci Feb 10, 2025
e7f1e8c
Merge branch 'main' of github.com:transcom/mymove into B-22307
r-mettler Feb 10, 2025
20585b5
Merge branch 'MAIN-B-22020-TIO-payment-request-calculations-BE' into …
taeJungCaci Feb 10, 2025
4016255
Merge branch 'MAIN-B-21416-intl-crating-TIO-update-for-payment-reques…
taeJungCaci Feb 10, 2025
cadf186
Merge branch 'main' into MAIN-B-21416-intl-crating-TIO-update-for-pay…
taeJungCaci Feb 10, 2025
ab4c16e
Merge pull request #14678 from transcom/INT-B-21423-Prime-Int-SIT-Ser…
MInthavongsay Feb 10, 2025
43c1786
Merge branch 'integrationTesting' into INT-B-22020-TIO-payment-reques…
taeJungCaci Feb 10, 2025
d26fcf8
fixed test cases
JonSpight Feb 10, 2025
5ca21d4
Merge branch 'B-22307' of github.com:transcom/mymove into B-22307-INT
r-mettler Feb 10, 2025
666fc12
Merge branch 'integrationTesting' of github.com:transcom/mymove into …
r-mettler Feb 10, 2025
a12ace7
Merge branch 'main' into B-22301-main
JonSpight Feb 10, 2025
c3e53bc
replace IN
r-mettler Feb 10, 2025
33178b7
Merge branch 'main' of github.com:transcom/mymove into B-22306
r-mettler Feb 10, 2025
b7954af
Merge branch 'main' of github.com:transcom/mymove into B-22307
r-mettler Feb 10, 2025
d3b5ce0
Merge branch 'B-22306' of github.com:transcom/mymove into B-22307
r-mettler Feb 10, 2025
864ae60
Merge branch 'B-22307' of github.com:transcom/mymove into B-22307-INT
r-mettler Feb 10, 2025
52137a2
Merge pull request #14751 from transcom/INT-B-22020-TIO-payment-reque…
taeJungCaci Feb 10, 2025
5b9623a
Merge branch 'integrationTesting' into INT-B-21416-intl-crating-TIO-u…
taeJungCaci Feb 10, 2025
6432a96
Merge branch 'B-22301-main' into B-22301-int
JonSpight Feb 10, 2025
7257187
Merge branch 'integrationTesting' into B-22301-int
JonSpight Feb 10, 2025
334b8d7
Merge branch 'main' of github.com:transcom/mymove into B-22307
r-mettler Feb 10, 2025
7e4ec8e
Merge branch 'integrationTesting' of github.com:transcom/mymove into …
r-mettler Feb 10, 2025
f6226b9
Merge branch 'B-22307' of github.com:transcom/mymove into B-22307-INT
r-mettler Feb 10, 2025
3aa3590
remove old test
JonSpight Feb 10, 2025
c7b7cf1
one big ole fat commit, migration added, testharnesses added
danieljordan-caci Feb 10, 2025
b77b09e
adding origin SIT extension
danieljordan-caci Feb 10, 2025
fb73fce
Merge branch 'main' into MAIN-B-21416-intl-crating-TIO-update-for-pay…
taeJungCaci Feb 10, 2025
48964bb
added min crating size applied
taeJungCaci Feb 10, 2025
f4eb9c5
Merge integrationTesting into INT-B-20984
brianmanley-caci Feb 10, 2025
1e24593
Merge remote-tracking branch 'origin/MAIN-B-22451' into INT-B-22451
danieljordan-caci Feb 10, 2025
747f49f
B-20984 make date in input and wording consistent
brianmanley-caci Feb 10, 2025
184fe87
Merge remote-tracking branch 'origin/MAIN-B-20984' into INT-B-20984-V…
brianmanley-caci Feb 10, 2025
330349c
Merge branch 'B-22301-main' into B-22301-int
JonSpight Feb 10, 2025
3196b19
Merge branch 'integrationTesting' into INT-B-21094
taeJungCaci Feb 10, 2025
d457059
Merge branch 'main' into B-21962-Create-Requested-Users-Report
TevinAdams Feb 10, 2025
6f78c93
Functional change for export
TevinAdams Feb 10, 2025
534ed93
Remove duplicate test from integration branch
brianmanley-caci Feb 10, 2025
5d51a36
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 10, 2025
6792999
Merge branch 'MAIN-B-21416-intl-crating-TIO-update-for-payment-reques…
taeJungCaci Feb 10, 2025
1f242fe
int merge changes
taeJungCaci Feb 10, 2025
1c4d4bd
Merge branch 'B-21962-Create-Requested-Users-Report' into B-21962-Cre…
TevinAdams Feb 10, 2025
fe3eb02
int merge changes
taeJungCaci Feb 10, 2025
c74bd7b
Merge branch 'MAIN-B-21416-intl-crating-TIO-update-for-payment-reques…
taeJungCaci Feb 10, 2025
17cb408
fix issue with servicemember coming back null when getting orders for…
pambecker Feb 10, 2025
600409c
Merge pull request #14364 from transcom/INT-B-21094
brooklyn-welsh Feb 10, 2025
a0e39aa
Merge branch 'integrationTesting' into INT-B-21416-intl-crating-TIO-u…
taeJungCaci Feb 10, 2025
06057d5
Merge branch 'B-22480-fix-prime-api-with-AK-dest-move' into B-22480-INT
pambecker Feb 10, 2025
639ed72
Merge branch 'integrationTesting' into B-22368-INT
paulstonebraker Feb 10, 2025
8a936e0
Merge branch 'integrationTesting' into INT-B-20984-Validate-SIT-Depar…
brianmanley-caci Feb 10, 2025
e25ccab
Secondary pickup disabeld
JonSpight Feb 10, 2025
170ffa2
Merge branch 'B-22301-main' into B-22301-int
JonSpight Feb 10, 2025
b9763fb
check nil
pambecker Feb 11, 2025
faa309a
Merge branch 'B-22480-fix-prime-api-with-AK-dest-move' into B-22480-INT
pambecker Feb 11, 2025
69d255d
Merge pull request #14750 from transcom/B-22368-INT
paulstonebraker Feb 11, 2025
63e56ea
Merge branch 'integrationTesting' into B-22480-INT
pambecker Feb 11, 2025
41603e2
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 11, 2025
67c1d7b
Merge branch 'integrationTesting' into INT-B-21416-intl-crating-TIO-u…
taeJungCaci Feb 11, 2025
b9248d4
Merge branch 'integrationTesting' into B-22305-INT-Milmove-Error-mess…
joeydoyecaci Feb 11, 2025
3e70104
Merge pull request #14787 from transcom/B-22480-INT
pambecker Feb 11, 2025
4c42ca8
adding origin and both shuttle to testharness - whoops
danieljordan-caci Feb 11, 2025
b8a03e1
Merge remote-tracking branch 'origin/MAIN-B-22451' into INT-B-22451
danieljordan-caci Feb 11, 2025
7727296
Merge branch 'integrationTesting' into B-22301-int
JonSpight Feb 11, 2025
a5e32b0
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 11, 2025
2c1f2e1
refactor
taeJungCaci Feb 11, 2025
301edd0
Merge branch 'MAIN-B-21416-intl-crating-TIO-update-for-payment-reques…
taeJungCaci Feb 11, 2025
1c65288
Merge pull request #14763 from transcom/B-22305-INT-Milmove-Error-mes…
joeydoyecaci Feb 11, 2025
4ce30f6
fix merge issues?
josiahzimmerman-caci Feb 11, 2025
d2ab8bf
updating comments
danieljordan-caci Feb 11, 2025
cef20d0
Merge remote-tracking branch 'origin/MAIN-B-22451' into INT-B-22451
danieljordan-caci Feb 11, 2025
84775da
Merge branch 'integrationTesting' into I-mergeupdatedmain
josiahzimmerman-caci Feb 11, 2025
a617e8a
Merge pull request #14791 from transcom/I-mergeupdatedmain
josiahzimmerman-caci Feb 11, 2025
aaafd7d
Merge branch 'integrationTesting' into B-22301-int
JonSpight Feb 11, 2025
54e24af
fixed conflicts
JonSpight Feb 11, 2025
5535795
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 11, 2025
641f94e
Merge branch 'integrationTesting' into INT-B-21416-intl-crating-TIO-u…
taeJungCaci Feb 11, 2025
b99d191
Merge pull request #14748 from transcom/B-22301-int
JonSpight Feb 11, 2025
9ff6361
Merge branch 'integrationTesting' into INT-B-21416-intl-crating-TIO-u…
taeJungCaci Feb 11, 2025
2401ad4
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 11, 2025
8e51252
CSV header adjustment
TevinAdams Feb 11, 2025
612ef47
Merge branch 'B-21962-Create-Requested-Users-Report' into B-21962-Cre…
TevinAdams Feb 11, 2025
97fac7f
Update .gitlab-ci.yml
josiahzimmerman-caci Feb 11, 2025
798ee2c
Merge remote-tracking branch 'origin/integrationTesting' into INT-B-2…
danieljordan-caci Feb 11, 2025
28dac86
Merge pull request #14794 from transcom/fix_integrationTesting
josiahzimmerman-caci Feb 11, 2025
9a6ea7b
Merge branch 'integrationTesting' into INT-B-21416-intl-crating-TIO-u…
taeJungCaci Feb 11, 2025
505474d
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 11, 2025
2fa2a9c
Merge pull request #14766 from transcom/INT-B-21416-intl-crating-TIO-…
taeJungCaci Feb 11, 2025
d9e138c
Merge remote-tracking branch 'origin/integrationTesting' into INT-B-2…
brianmanley-caci Feb 12, 2025
52f74ab
Merge remote-tracking branch 'origin/integrationTesting' into INT-B-2…
danieljordan-caci Feb 12, 2025
3caf62f
Merge remote-tracking branch 'origin/integrationTesting' into INT-B-2…
danieljordan-caci Feb 12, 2025
60351ef
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 12, 2025
363b154
Merge pull request #14784 from transcom/INT-B-22451
danieljordan-caci Feb 12, 2025
a63fcc5
Merge branch 'integrationTesting' of github.com:transcom/mymove into …
r-mettler Feb 12, 2025
09d3f48
revert quotes changed by merge
r-mettler Feb 12, 2025
062feb8
homesafe connect doesn't need to be in the file
r-mettler Feb 12, 2025
42ecaa9
Merge branch 'integrationTesting' into B-21962-Create-Requested-Users…
TevinAdams Feb 12, 2025
6d25068
Merge pull request #14768 from transcom/B-21962-Create-Requested-User…
TevinAdams Feb 12, 2025
345b6ff
Merge branch 'integrationTesting' into B-22307-INT
r-mettler Feb 12, 2025
e1f94ef
test fixes
danieljordan-caci Feb 12, 2025
e5cea06
Merge remote-tracking branch 'origin/MAIN-B-22451' into INT-B-22451-t…
danieljordan-caci Feb 12, 2025
f8570f2
Merge branch 'integrationTesting' into INT-B-20984-Validate-SIT-Depar…
brianmanley-caci Feb 12, 2025
d160ef3
Merge pull request #14774 from transcom/B-22307-INT
r-mettler Feb 12, 2025
fa06515
Merge pull request #14801 from transcom/INT-B-22451-text-fixes
danieljordan-caci Feb 12, 2025
7ec012d
Merge branch 'integrationTesting' into INT-B-20984-Validate-SIT-Depar…
brianmanley-caci Feb 12, 2025
6529c15
Merge pull request #14779 from transcom/INT-B-20984-Validate-SIT-Depa…
brianmanley-caci Feb 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 17 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ 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
Expand Down Expand Up @@ -897,8 +897,8 @@ commands:
export FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
export FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
export FEATURE_FLAG_QUEUE_MANAGEMENT=false
export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
export FEATURE_FLAG_ENABLE_ALASKA=false
export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
export FEATURE_FLAG_ENABLE_HAWAII=false
export FEATURE_FLAG_BULK_ASSIGNMENT=false

Expand Down Expand Up @@ -945,6 +945,7 @@ commands:
FEATURE_FLAG_UNACCOMPANIED_BAGGAGE: 'false'
FEATURE_FLAG_ENABLE_ALASKA: 'false'
FEATURE_FLAG_BULK_ASSIGNMENT: 'false'

command: |
SHARD=$((${CIRCLE_NODE_INDEX}+1))
PLAYWRIGHT_JUNIT_OUTPUT_NAME=playwright-results.xml \
Expand Down Expand Up @@ -1546,7 +1547,7 @@ jobs:
#
# The trailing hyphen in restore_cache seems important
# according to the page linked above
- v11-server-tests-coverage-
- v1-server-tests-coverage-integration
- run:
name: Ensure Test Coverage Increasing
command: |
Expand Down Expand Up @@ -1585,7 +1586,7 @@ jobs:
- when:
condition:
and:
- equal: [main, << pipeline.git.branch >>]
- equal: [integrationTesting, << pipeline.git.branch >>]
- when: always
steps:
- run:
Expand All @@ -1602,7 +1603,7 @@ jobs:
# Use the BuildNum to update the cache key so that the
# coverage cache is always updated
- save_cache:
key: v11-server-tests-coverage-{{ .BuildNum }}
key: v1-server-tests-coverage-integration{{ .BuildNum }}
paths:
- ~/transcom/mymove/tmp/baseline-go-coverage
when: always
Expand Down Expand Up @@ -1664,8 +1665,12 @@ jobs:
- checkout
- attach_workspace:
at: .
- restore_cache:
#
- when:
condition:
equal: [integrationTesting, << pipeline.git.branch >>]
steps:
- restore_cache:
#
# https://circleci.com/docs/caching/#restoring-cache
#
# restore the latest version of the test coverage in the
Expand All @@ -1682,8 +1687,8 @@ jobs:
#
# The trailing hyphen in restore_cache seems important
# according to the page linked above
keys:
- v8-client-tests-coverage-
keys:
- v1-client-tests-coverage-integration
- run:
name: Ensure Test Coverage Increasing
command: |
Expand Down Expand Up @@ -1720,7 +1725,7 @@ jobs:
- when:
condition:
and:
- equal: [main, << pipeline.git.branch >>]
- equal: [integrationTesting, << pipeline.git.branch >>]
steps:
- run:
name: 'Copy coverage to baseline'
Expand All @@ -1735,7 +1740,7 @@ jobs:
# Use the BuildNum to update the cache key so that the
# coverage cache is always updated
- save_cache:
key: v8-client-tests-coverage-{{ .BuildNum }}
key: v1-client-tests-coverage-integration{{ .BuildNum }}
paths:
- ~/transcom/mymove/tmp/baseline-jest-coverage
when: always
Expand All @@ -1752,7 +1757,6 @@ jobs:
--value "${coverage}" \
--timestamp "${timestamp}"
when: always

# Compile the server side of the app once and persist the relevant
# build artifacts to the workspace.
# This way we don't have to re-run the build and since all necessary
Expand Down Expand Up @@ -2780,4 +2784,4 @@ experimental:
notify:
branches:
only:
- main
- main
18 changes: 14 additions & 4 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ export DEVLOCAL_AUTH=true
export DOD_CA_PACKAGE="${MYMOVE_DIR}/config/tls/milmove-cert-bundle.p7b"

# MyMove client certificate
# All of our DoD-signed certs are currently signed by DOD SW CA-75
# All of our DoD-signed certs are currently signed by DOD SW CA-66
# This cannot be changed unless our certs are all resigned
MOVE_MIL_DOD_CA_CERT=$(cat "${MYMOVE_DIR}"/config/tls/dod-sw-ca-75.pem)
MOVE_MIL_DOD_CA_CERT=$(cat "${MYMOVE_DIR}"/config/tls/dod-sw-ca-66.pem)
require MOVE_MIL_DOD_TLS_CERT "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal move_mil_dod_tls_cert'"
require MOVE_MIL_DOD_TLS_KEY "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal move_mil_dod_tls_key'"
export MOVE_MIL_DOD_CA_CERT
Expand All @@ -232,19 +232,22 @@ export TZ="UTC"

# AWS development access
#
# To use S3/SES for local builds, you'll need to uncomment the following.
# To use S3/SES or SNS & SQS for local builds, you'll need to uncomment the following.
# Do not commit the change:
#
# export STORAGE_BACKEND=s3
# export EMAIL_BACKEND=ses
# export RECEIVER_BACKEND=sns_sqs
#
# Instructions for using S3 storage backend here: https://dp3.atlassian.net/wiki/spaces/MT/pages/1470955567/How+to+test+storing+data+in+S3+locally
# Instructions for using SES email backend here: https://dp3.atlassian.net/wiki/spaces/MT/pages/1467973894/How+to+test+sending+email+locally
# Instructions for using SNS&SQS backend here: https://dp3.atlassian.net/wiki/spaces/MT/pages/2793242625/How+to+test+notifications+receiver+locally
#
# The default and equivalent to not being set is:
#
# export STORAGE_BACKEND=local
# export EMAIL_BACKEND=local
# export RECEIVER_BACKEND=local
#
# Setting region and profile conditionally while we migrate from com to govcloud.
if [ "$STORAGE_BACKEND" == "s3" ]; then
Expand All @@ -258,6 +261,13 @@ export AWS_S3_KEY_NAMESPACE=$USER
export AWS_SES_DOMAIN="devlocal.dp3.us"
export AWS_SES_REGION="us-gov-west-1"

if [ "$RECEIVER_BACKEND" == "sns_sqs" ]; then
export SNS_TAGS_UPDATED_TOPIC="app_s3_tag_events"
export SNS_REGION="us-gov-west-1"
# cleanup flag false by default, only used at server startup to wipe receiver artifacts from previous runs
# export RECEIVER_CLEANUP_ON_START=false
fi

# To use s3 links aws-bucketname/xx/user/ for local builds,
# you'll need to add the following to your .envrc.local:
#
Expand Down Expand Up @@ -444,4 +454,4 @@ then
fi

# Check that all required environment variables are set
check_required_variables
check_required_variables
37 changes: 36 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,39 @@
# owners will be requested for a review.
# Add language specific code owners if it becomes relevant

* @transcom/codeowners
# database team
/migrations/ @transcom/cacidatabaseteam
/pkg/assets/sql_scripts/ @transcom/cacidatabaseteam

# backend team
/pkg/ @transcom/cacibackendteam
/swagger-def/ @transcom/cacibackendteam
*.go @transcom/cacibackendteam


# frontend team
/src/ @transcom/cacifrontendteam
/playwright/tests/ @transcom/cacifrontendteam


## not required for team specific review as prime UI is not deployed to production app
src/components/PrimeUI/
src/pages/PrimeUI/


# Require tech lead review for changes to the following files
.golangci.yml @transcom/codeowners
.pre-commit-config.yaml @transcom/codeowners
.eslintrc.js @transcom/codeowners
/eslint-plugin-ato/ @transcom/codeowners
/pkg/ato-linter/ @transcom/codeowners
/scripts/ @transcom/codeowners
/.circleci/config.yml @transcom/codeowners
/config/ @transcom/codeowners
Dockerfile* @transcom/codeowners
Brewfile* @transcom/codeowners
/Makefile @transcom/codeowners
package.json @transcom/codeowners
go.mod @transcom/codeowners
/github/ @transcom/codeowners
docker-compose* @transcom/codeowners
2 changes: 1 addition & 1 deletion .github/workflows/happo-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Happo CI

on:
pull_request:
branches: [main]
branches: [main,integrationTesting]

jobs:
changes:
Expand Down
16 changes: 8 additions & 8 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
variables:
#Docker config
DOCKER_AUTH_CONFIG: "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD\"}}}"
#hard code sha as newer version of debian is needed for pre-test

DOCKER_APP_IMAGE: milmove01/transcom-docker:milmove-app
DOCKER_BASE_IMAGE: milmove01/transcom-docker:base
DOCKERHUB_USERNAME: DOCKERHUB_USERNAME
Expand All @@ -30,16 +30,16 @@ variables:
GOLANGCI_LINT_VERBOSE: "-v"

# Specify the environment: loadtest, demo, exp
DP3_ENV: &dp3_env placeholder_env
DP3_ENV: &dp3_env loadtest

# Specify the branch to deploy TODO: this might be not needed. So far useless
DP3_BRANCH: &dp3_branch placeholder_branch_name
DP3_BRANCH: &dp3_branch integrationTesting

# Ignore branches for integration tests
INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch placeholder_branch_name
INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch placeholder_branch_name
CLIENT_IGNORE_BRANCH: &client_ignore_branch placeholder_branch_name
SERVER_IGNORE_BRANCH: &server_ignore_branch placeholder_branch_name
INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch integrationTesting
INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch integrationTesting
CLIENT_IGNORE_BRANCH: &client_ignore_branch integrationTesting
SERVER_IGNORE_BRANCH: &server_ignore_branch integrationTesting

OTEL_IMAGE_TAG: &otel_image_tag "git-$OTEL_VERSION-$CI_COMMIT_SHORT_SHA"

Expand Down Expand Up @@ -2043,4 +2043,4 @@ deploy_app_prd:
after_script:
- *announce_failure
rules:
- *check_main
- *check_main
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ ENTRYPOINT ["/bin/milmove"]

CMD ["serve", "--logging-level=debug"]

EXPOSE 8080
EXPOSE 8080
3 changes: 2 additions & 1 deletion Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ COPY --from=builder --chown=root:root /home/circleci/project/bin/rds-ca-2019-roo
COPY --from=builder --chown=root:root /home/circleci/project/bin/milmove /bin/milmove

COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-75.pem
COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem

# While it's ok to have these certs copied locally, they should never be copied into Dockerfile.
COPY config/tls/devlocal-ca.key /config/tls/devlocal-ca.key
Expand Down
Loading
Loading