Skip to content

Feature/merge develop to main #259

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

Merged
merged 67 commits into from
Mar 10, 2025
Merged

Feature/merge develop to main #259

Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
2a76019
139799 - Bespoke Exchange Set Configuration Service Project Skeleton …
harshal11869 Jan 30, 2024
d593a52
140028 -added task to build and publish webjob project AB#140028 AB#1…
surendrabehara2022 Feb 5, 2024
4a66f04
140036 - Bespoke Exchange Set Builder Service Project Skeleton Creati…
rupali15127 Feb 6, 2024
305ce59
140029 - BESS Configuration Service WebJob Logging and Config (#111)
ratnas104142 Feb 13, 2024
000d802
Merge remote-tracking branch 'origin/main' into dev/Abzu-144739-stryk…
hukho Feb 22, 2024
2b55327
Merge pull request #120 from UKHO/dev/Abzu-144739-stryker-dotnet-update
hukho Feb 22, 2024
c22bede
Merge remote-tracking branch 'origin/main' into dev/Abzu-137903-14441…
hukho Feb 26, 2024
b78012e
Merge pull request #127 from UKHO/dev/Abzu-137903-144414-merge
hukho Feb 26, 2024
e685a92
140033 : Accessing config files and storing in object (#116)
abhijeet14992 Feb 27, 2024
d605db8
142690 - added task to build and publish bessbs webjob project AB#142…
surendrabehara2022 Feb 28, 2024
3532ba3
140035 - Bess Configuration Service Frequency Expression / Cron Imple…
MastekRohitChettri Mar 4, 2024
a2e4483
142682 - BESS CS Create Mock Endpoint for File Upload (#128)
shailen14599 Mar 7, 2024
c27dab5
142689 - BESS Builder Service WebJob Logging and Configuration (#130)
rupali15127 Mar 8, 2024
c14342e
142686 - Validating config file (#129)
chaital14503 Mar 11, 2024
2ffb128
140034 - BESS CS - Get AVCS Catalogue from SCS (#131)
ratnas104142 Mar 12, 2024
be56d0b
148824 - SCS Mock (#134)
Nadeem14456 Mar 18, 2024
7c89121
147395 - Config File Upliftment (#135)
ratnas104142 Mar 20, 2024
a13cae6
142688 - Bess Configuration Service get enccellname from prefix patte…
MastekRohitChettri Mar 20, 2024
821248a
142790 queue message to create bespoke exchange set (#136)
chaital14503 Mar 22, 2024
ee3ff46
147129 - Bess builder service read queue message (#139)
abhijeet14992 Mar 27, 2024
6beeb1a
140038 - Bess Builder Service AD authorization for Ess and Fss API (#…
rupali15127 Mar 28, 2024
918af0a
Remove Functional tests (#137)
DanOwenUKHO Apr 4, 2024
bee4112
Dev/updatee2egates (#140)
DanOwenUKHO Apr 8, 2024
c9d0636
147132 - BS Request and Download Exchange set (#141)
shailen14599 Apr 10, 2024
feff109
Automated Functional Test of BS: request download exchange set (#143)
Arit14975 Apr 18, 2024
aee1610
147177 - bess bs maintain cell edition in azure table (#145)
MastekRohitChettri Apr 24, 2024
aba6929
147200 - macros logic implementation (#146)
chaital14503 Apr 29, 2024
78de319
140039 - BESS Builder Service Ancillary Files Get Readme From FSS (…
rupali15127 Apr 30, 2024
a3e5372
140042 PKS Wiremock Service (#151)
shirinbt14926 May 2, 2024
bfb24eb
147178 - BS ancillary files delete product update serial (#152)
chaital14503 May 3, 2024
c8b2da9
147171 - BS Handling of empty ES and Error.txt Scenarios (#154)
Madhav15303 May 7, 2024
8aa6ca3
140043 - BESS Cleanup Web Job and Logging Config (#156)
ratnas104142 May 7, 2024
004590b
149734 - Bess bs ad authorization for pks (#157)
abhijeet14992 May 8, 2024
eddb482
147394 - BESS configuration service code upliftment (#158)
MastekRohitChettri May 10, 2024
48507e8
140040 - BESS builder service get permit key create key file (#160)
MastekRohitChettri May 13, 2024
936e8e8
Dev/stryker updates2 (#159)
DanOwenUKHO May 14, 2024
dea3d89
140041 - Bess bs save bespoke exchange set on fss (#161)
chaital14503 May 14, 2024
6ccc1e5
154171 - BESS builder service code upliftment (#163)
shailen14599 May 17, 2024
5389a20
154171 - BESS builder service correlationId upliftment (#168)
Nadeem14456 May 24, 2024
fde1169
152369 - adding firewall rule to storage account (#169)
surendrabehara2022 May 24, 2024
419a28b
159261 - Exclude Permit for Empty Bespoke Exchange Set (#173)
shailen14599 May 30, 2024
4206588
macro name updated in UT (#174)
DanOwenUKHO May 31, 2024
eb665dd
Merge and update packages
hukho Jun 13, 2024
b33ab5c
Merge and update packages
hukho Jun 13, 2024
89923d7
Removed CVE suppressions from NVDSuppressions.xml
hukho Jun 13, 2024
1663991
Remove duplicate package reference
hukho Jun 13, 2024
a436ab3
Update macro transformer tests
hukho Jun 13, 2024
854ab98
Merge pull request #182 from UKHO/dev/abzu-update-from-main-hb
hukho Jun 17, 2024
70c6e4a
Dev/update develop from main (#232)
DanOwenUKHO Nov 21, 2024
5b2c40d
Dev/fixv next env (#233)
DanOwenUKHO Nov 21, 2024
7cf2606
190004 - remove readme entry from catalog file (#236)
Nadeem14456 Nov 29, 2024
32f736a
changes for bess webjob configuration (#237)
amogh14893 Dec 2, 2024
3848658
Update .NET SDK to 6.0.428 (#240)
github-actions[bot] Dec 9, 2024
0715c84
Bump Microsoft.Extensions.Caching.Memory (#221)
dependabot[bot] Dec 12, 2024
ca433ed
Bump the all-packages group across 1 directory with 20 updates (#239)
dependabot[bot] Dec 12, 2024
1db061c
Bump the all-packages group across 1 directory with 11 updates (#242)
dependabot[bot] Dec 12, 2024
f86eec7
Bump the all-packages group in /UKHO.FmEssFssMock.API/UKHO.FmEssFssMo…
dependabot[bot] Jan 2, 2025
7da00d2
Bump the all-packages group (#244)
dependabot[bot] Jan 3, 2025
cd3ef90
Dev/new env2 (#245)
DanOwenUKHO Jan 14, 2025
c9df668
Dev/update to net8 (#246)
DanOwenUKHO Jan 28, 2025
8e57ac0
Abzu 197389 cd printing (#249)
JiviteshT Feb 4, 2025
e88743d
Bump Azure.Identity from 1.13.1 to 1.13.2 in /UKHO.PeriodicOutputServ…
dependabot[bot] Feb 6, 2025
7daf3d7
Process AIO weeks to increment and update file names (#251)
hukho Feb 11, 2025
461bc1a
Abzu-204071-fixed pipeline job for FM health check (#252)
JiviteshT Feb 11, 2025
7912c70
Move unit tests to correct project (#253)
hukho Feb 11, 2025
03dfde5
Merge pull request #255 from UKHO/dev/merge-main-to-develop-03032025
JiviteshT Mar 3, 2025
f05bdc1
Merged below commit from main -
JiviteshT Mar 7, 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
5 changes: 2 additions & 3 deletions UKHO.FmEssFssMock.API/UKHO.FmEssFssMock.API/Services/FileShareService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ public class FileShareService
Batch.BessNoneReadmeBatch
};

private readonly Enum[] aioBatchTypes = new Enum[]
{
private readonly Enum[] aioBatchTypes = {
Batch.AioBaseCDZipIsoSha1Batch,
Batch.AioUpdateZipBatch,
Batch.EssAioBaseZipBatch,
Expand Down Expand Up @@ -111,7 +110,7 @@ public BatchDetail GetBatchDetails(string batchId, string homeDirectoryPath)
}

//BESS - batch attributes from Queue message - start
Batch batchEnu = EnumHelper.GetValueFromDescription<Batch>(batchId);

if (bessBatchTypes.Contains(EnumHelper.GetValueFromDescription<Batch>(batchId)))
{
ConfigQueueMessage message = new()
Expand Down