Skip to content

Commit 3e89bdd

Browse files
crvreddycrvreddy
authored
Merge pull request #391 from siemens/release/codecleanup_v8.4.1
feat: updated versions in project files and code cleanup
2 parents 8bd0841 + 5c69c29 commit 3e89bdd

32 files changed

+115
-126
lines changed

‎.github/workflows/build-and-release.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949

5050
- name: Build Docker Image
5151
run: |
52-
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v8.4.0
53-
docker save ${{ github.repository }}:continuous-clearing-v8.4.0 -o continuous-clearing-v8.4.0.tar
52+
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v8.4.1
53+
docker save ${{ github.repository }}:continuous-clearing-v8.4.1 -o continuous-clearing-v8.4.1.tar
5454
5555
- name: Upload Docker Image
5656
uses: actions/upload-artifact@v4
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Pack NuGet Package
7676
run: |
77-
nuget pack CA.nuspec -Version 8.4.0
77+
nuget pack CA.nuspec -Version 8.4.1
7878
7979
- name: Upload NuGet Package
8080
uses: actions/upload-artifact@v4
@@ -114,25 +114,25 @@ jobs:
114114
env:
115115
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
116116
with:
117-
tag_name: v8.4.0
118-
release_name: Release v8.4.0
117+
tag_name: v8.4.1
118+
release_name: Release v8.4.1
119119
body: |
120120
${{ github.event.head_commit.message }}
121121
draft: true
122122
prerelease: false
123123

124124
- name: Compress Full Build Output into ZIP
125125
run: |
126-
powershell -Command "& {Compress-Archive -Path ${{ github.workspace }}/out/* -DestinationPath ${{ github.workspace }}/continuous-clearing-v8.4.0.zip}"
126+
powershell -Command "& {Compress-Archive -Path ${{ github.workspace }}/out/* -DestinationPath ${{ github.workspace }}/continuous-clearing-v8.4.1.zip}"
127127
128128
- name: Upload Full Build Output ZIP to Release
129129
uses: actions/upload-release-asset@v1
130130
env:
131131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132132
with:
133133
upload_url: ${{ steps.create_release.outputs.upload_url }}
134-
asset_path: ${{ github.workspace }}/continuous-clearing-v8.4.0.zip
135-
asset_name: continuous-clearing-v8.4.0.zip
134+
asset_path: ${{ github.workspace }}/continuous-clearing-v8.4.1.zip
135+
asset_name: continuous-clearing-v8.4.1.zip
136136
asset_content_type: application/zip
137137

138138
- name: Upload Docker Image(tar) to Release
@@ -141,8 +141,8 @@ jobs:
141141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
142142
with:
143143
upload_url: ${{ steps.create_release.outputs.upload_url }}
144-
asset_path: ./continuous-clearing-v8.4.0.tar
145-
asset_name: continuous-clearing-v8.4.0.tar
144+
asset_path: ./continuous-clearing-v8.4.1.tar
145+
asset_name: continuous-clearing-v8.4.1.tar
146146
asset_content_type: application/x-tar
147147

148148
- name: Upload NuGet Package to Release
@@ -151,8 +151,8 @@ jobs:
151151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
152152
with:
153153
upload_url: ${{ steps.create_release.outputs.upload_url }}
154-
asset_path: ./continuous-clearing.8.4.0.nupkg
155-
asset_name: continuous-clearing.8.4.0.nupkg
154+
asset_path: ./continuous-clearing.8.4.1.nupkg
155+
asset_name: continuous-clearing.8.4.1.nupkg
156156
asset_content_type: application/octet-stream
157157

158158
- name: Upload ReadmeOSS_nupkg file to Release

‎CA.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package >
55
<metadata>
66
<id>continuous-clearing</id>
7-
<version>8.4.0</version>
7+
<version>8.4.1</version>
88
<authors>Siemens AG</authors>
99
<owners>continuous-clearing contributors</owners>
1010
<projectUrl>https://github.com/siemens/continuous-clearing</projectUrl>

‎src/AritfactoryUploader.UTest/ArtifactoryValidatorTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// --------------------------------------------------------------------------------------------------------------------
66

77
using LCT.APICommunications.Interfaces;
8-
using LCT.ArtifactoryUploader;
98
using Moq;
109
using NUnit.Framework;
1110
using System.Net;

‎src/AritfactoryUploader.UTest/JfrogRepoUpdaterTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using CycloneDX.Models;
88
using LCT.APICommunications.Model;
99
using LCT.APICommunications.Model.AQL;
10-
using LCT.ArtifactoryUploader;
1110
using LCT.Services.Interface;
1211
using Moq;
1312
using NUnit.Framework;

‎src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using CycloneDX.Models;
1010
using LCT.APICommunications;
1111
using LCT.APICommunications.Model;
12-
using LCT.ArtifactoryUploader;
1312
using LCT.ArtifactoryUploader.Model;
1413
using LCT.Common.Constants;
1514
using LCT.Common.Interface;

‎src/AritfactoryUploader.UTest/PackageUploadInformationTest.cs‎

Lines changed: 63 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66

77
using LCT.APICommunications;
88
using LCT.APICommunications.Model;
9-
using LCT.ArtifactoryUploader;
109
using LCT.ArtifactoryUploader.Model;
1110
using LCT.Common;
1211
using LCT.Common.Constants;
1312
using LCT.Common.Interface;
14-
using log4net;
1513
using log4net.Appender;
1614
using log4net.Config;
1715
using log4net.Core;
@@ -31,7 +29,7 @@ public class PackageUploadInformationTest
3129

3230
[SetUp]
3331
public void SetUp()
34-
{
32+
{
3533
_memoryAppender = new MemoryAppender();
3634
BasicConfigurator.Configure(_memoryAppender);
3735
_memoryAppender.Clear();
@@ -833,9 +831,9 @@ public void DisplayWithLogger_WithAllPackageTypes_ShouldLogAllInformation()
833831

834832
var jfrogFoundPackages = new List<ComponentsToArtifactory>
835833
{
836-
new ComponentsToArtifactory
837-
{
838-
Name = "FoundPkg",
834+
new ComponentsToArtifactory
835+
{
836+
Name = "FoundPkg",
839837
Version = "4.0.0",
840838
ResponseMessage = new HttpResponseMessage
841839
{
@@ -856,20 +854,20 @@ public void DisplayWithLogger_WithAllPackageTypes_ShouldLogAllInformation()
856854
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
857855

858856
// Act
859-
method.Invoke(null, new object[]
860-
{
861-
unknownPackages,
862-
jfrogNotFoundPackages,
863-
successfulPackages,
864-
jfrogFoundPackages,
865-
"TestPackageType",
866-
filepath
857+
method.Invoke(null, new object[]
858+
{
859+
unknownPackages,
860+
jfrogNotFoundPackages,
861+
successfulPackages,
862+
jfrogFoundPackages,
863+
"TestPackageType",
864+
filepath
867865
});
868866

869867
// Assert
870868
var events = _memoryAppender.GetEvents();
871869
Assert.IsTrue(events.Length > 0, "Expected log events to be captured");
872-
870+
873871
var infoEvent = FindEventByLevel(events, Level.Info);
874872
Assert.IsNotNull(infoEvent, "Expected Info level log event");
875873
StringAssert.Contains("TestPackageType", infoEvent.RenderedMessage);
@@ -886,20 +884,20 @@ public void DisplayWithLogger_WithEmptyPackageLists_ShouldLogName()
886884
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
887885

888886
// Act
889-
method.Invoke(null, new object[]
890-
{
891-
emptyList,
892-
emptyList,
893-
emptyList,
894-
emptyList,
895-
"EmptyPackageType",
896-
filepath
887+
method.Invoke(null, new object[]
888+
{
889+
emptyList,
890+
emptyList,
891+
emptyList,
892+
emptyList,
893+
"EmptyPackageType",
894+
filepath
897895
});
898896

899897
// Assert
900898
var events = _memoryAppender.GetEvents();
901899
Assert.IsTrue(events.Length > 0, "Expected at least one log event");
902-
900+
903901
var infoEvent = FindEventByLevel(events, Level.Info);
904902
Assert.IsNotNull(infoEvent, "Expected Info level log event");
905903
StringAssert.Contains("EmptyPackageType", infoEvent.RenderedMessage);
@@ -911,9 +909,9 @@ public void DisplayWithLogger_WithJfrogFoundPackagesErrorInUpload_ShouldLogError
911909
// Arrange
912910
var jfrogFoundPackages = new List<ComponentsToArtifactory>
913911
{
914-
new ComponentsToArtifactory
915-
{
916-
Name = "FailedPkg",
912+
new ComponentsToArtifactory
913+
{
914+
Name = "FailedPkg",
917915
Version = "1.0.0",
918916
ResponseMessage = new HttpResponseMessage
919917
{
@@ -933,14 +931,14 @@ public void DisplayWithLogger_WithJfrogFoundPackagesErrorInUpload_ShouldLogError
933931
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
934932

935933
// Act
936-
method.Invoke(null, new object[]
937-
{
938-
emptyList,
939-
emptyList,
940-
emptyList,
941-
jfrogFoundPackages,
942-
"npm",
943-
filepath
934+
method.Invoke(null, new object[]
935+
{
936+
emptyList,
937+
emptyList,
938+
emptyList,
939+
jfrogFoundPackages,
940+
"npm",
941+
filepath
944942
});
945943

946944
// Assert
@@ -967,14 +965,14 @@ public void DisplayWithLogger_WithJfrogNotFoundPackages_ShouldLogWarning()
967965
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
968966

969967
// Act
970-
method.Invoke(null, new object[]
971-
{
972-
emptyList,
973-
jfrogNotFoundPackages,
974-
emptyList,
975-
emptyList,
976-
"NuGet",
977-
filepath
968+
method.Invoke(null, new object[]
969+
{
970+
emptyList,
971+
jfrogNotFoundPackages,
972+
emptyList,
973+
emptyList,
974+
"NuGet",
975+
filepath
978976
});
979977

980978
// Assert
@@ -1001,20 +999,20 @@ public void DisplayWithLogger_WithSuccessfulPackages_ShouldLogInfo()
1001999
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
10021000

10031001
// Act
1004-
method.Invoke(null, new object[]
1005-
{
1006-
emptyList,
1007-
emptyList,
1008-
successfulPackages,
1009-
emptyList,
1010-
"Maven",
1011-
filepath
1002+
method.Invoke(null, new object[]
1003+
{
1004+
emptyList,
1005+
emptyList,
1006+
successfulPackages,
1007+
emptyList,
1008+
"Maven",
1009+
filepath
10121010
});
10131011

10141012
// Assert
10151013
var events = _memoryAppender.GetEvents();
10161014
Assert.IsTrue(events.Length >= 2, "Expected at least 2 log events");
1017-
1015+
10181016
// Check if any event contains the package name and success message
10191017
var packageEvent = FindEventContaining(events, "UploadedPkg");
10201018
Assert.IsNotNull(packageEvent, "Expected log event containing package name 'UploadedPkg'");
@@ -1042,9 +1040,9 @@ public void DisplayWithLogger_WithMultiplePackageTypes_ShouldCallAllDisplayMetho
10421040

10431041
var jfrogFoundPackages = new List<ComponentsToArtifactory>
10441042
{
1045-
new ComponentsToArtifactory
1046-
{
1047-
Name = "FoundPkg",
1043+
new ComponentsToArtifactory
1044+
{
1045+
Name = "FoundPkg",
10481046
Version = "4.0.0",
10491047
ResponseMessage = new HttpResponseMessage
10501048
{
@@ -1064,24 +1062,24 @@ public void DisplayWithLogger_WithMultiplePackageTypes_ShouldCallAllDisplayMetho
10641062
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
10651063

10661064
// Act
1067-
method.Invoke(null, new object[]
1068-
{
1069-
unknownPackages,
1070-
jfrogNotFoundPackages,
1071-
successfulPackages,
1072-
jfrogFoundPackages,
1073-
"Python",
1074-
filepath
1065+
method.Invoke(null, new object[]
1066+
{
1067+
unknownPackages,
1068+
jfrogNotFoundPackages,
1069+
successfulPackages,
1070+
jfrogFoundPackages,
1071+
"Python",
1072+
filepath
10751073
});
10761074

10771075
// Assert
10781076
var events = _memoryAppender.GetEvents();
10791077
Assert.IsTrue(events.Length >= 4, "Expected at least 4 log events (one for each package type)");
1080-
1078+
10811079
// Verify package type name is logged
10821080
var packageTypeEvent = FindEventContaining(events, "Python");
10831081
Assert.IsNotNull(packageTypeEvent, "Expected Python package type to be logged");
1084-
1082+
10851083
// Verify warning event for not found packages
10861084
var warnEvent = FindEventByLevel(events, Level.Warn);
10871085
Assert.IsNotNull(warnEvent, "Expected warning for not found packages");

‎src/AritfactoryUploader.UTest/UploadToArtifactoryTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using LCT.APICommunications;
99
using LCT.APICommunications.Model;
1010
using LCT.APICommunications.Model.AQL;
11-
using LCT.ArtifactoryUploader;
1211
using LCT.ArtifactoryUploader.Model;
1312
using LCT.Common;
1413
using LCT.Common.Constants;

‎src/ArtifactoryUploader/LCT.ArtifactoryUploader.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net8.0</TargetFramework>
66
<AssemblyName>ArtifactoryUploader</AssemblyName>
7-
<Version>8.4.0</Version>
7+
<Version>8.4.1</Version>
88
</PropertyGroup>
99

1010
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

‎src/ArtifactoryUploader/PackageUploader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static async Task UploadPackageToArtifactory(CommonAppSettings appSetting
8787
Logger.Debug($"UploadPackageToArtifactory():Upload package to artifactory process has completed");
8888

8989
// set the error code
90-
PackageUploadInformation.SetExitCode(uploaderKpiData, environmentHelper);
90+
PackageUploadInformation.SetExitCode(uploaderKpiData, environmentHelper);
9191

9292
}
9393

0 commit comments

Comments
 (0)