Skip to content

Commit d876bb8

Browse files
updated code changes
1 parent c7faab5 commit d876bb8

29 files changed

+4
-38
lines changed

src/LCT.Common/CommonAppSettings.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public string ProjectType
6262
}
6363
}
6464
public bool MultipleProjectType { get; set; } = false;
65-
public bool BasicSBOM { get; set; } = true;
65+
public bool BasicSBOM { get; set; } = false;
6666
public Telemetry Telemetry { get; set; }
6767
public SW360 SW360 { get; set; }
6868
public Directory Directory { get; set; }

src/SW360IntegrationTest/Alpine/ComponentCreatorInitialAlpine.cs

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public void Setup()
4747
TestConstant.JFrogApiURL, testParameters.JfrogApi,
4848
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
4949
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
50-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5150
TestConstant.ProjectType,"ALPINE",
5251
TestConstant.Mode,""});
5352
}

src/SW360IntegrationTest/Alpine/PackageIdentifierInitialAlpine.cs

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()
5353
TestConstant.JFrogApiURL, testParameters.JfrogApi,
5454
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
5555
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
56-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5756
TestConstant.ProjectType,"ALPINE",
5857
TestConstant.Mode,""}),
5958
"Test to run Package Identifier EXE execution");

src/SW360IntegrationTest/Conan/ComponentCreatorInitialConan.cs

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public void Setup()
3838
TestConstant.JfrogConanInternalRepo,"Conan-test",
3939
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
4040
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
41-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
4241
TestConstant.ProjectType, "CONAN",
4342
TestConstant.Mode,""
4443
});

src/SW360IntegrationTest/Conan/PackageIdentifierInitialConan.cs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()
4545
TestConstant.JfrogConanInternalRepo,"Conan-test",
4646
TestConstant.ProjectType,"Conan",
4747
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
48-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
4948
TestConstant.Mode,""}),
5049
"Test to run Package Identifier EXE execution");
5150
}

src/SW360IntegrationTest/Debian/ComponentCreatorInitialDebian.cs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public void Setup()
4545
TestConstant.JFrogApiURL, testParameters.JfrogApi,
4646
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
4747
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
48-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
4948
TestConstant.JfrogDebianInternalRepo,"Debian-test",
5049
TestConstant.ProjectType,"DEBIAN",
5150
TestConstant.Mode,""});

src/SW360IntegrationTest/Debian/PackageIdentifierInitialDebian.cs

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()
5353
TestConstant.JFrogApiURL, testParameters.JfrogApi,
5454
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
5555
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
56-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5756
TestConstant.JfrogDebianInternalRepo,"Debian-test",
5857
TestConstant.ProjectType,"Debian",
5958
TestConstant.Mode,""}),

src/SW360IntegrationTest/Maven/ComponentCreatorInitialMaven.cs

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public void Setup()
4848
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
4949
TestConstant.JfrogMavenInternalRepo,"Maven-test",
5050
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
51-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5251
TestConstant.ProjectType,"MAVEN",
5352
TestConstant.Mode,""});
5453
}

src/SW360IntegrationTest/Maven/PackageIdentifierInitialMaven.cs

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()
5252
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
5353
TestConstant.JfrogMavenInternalRepo,"Maven-test",
5454
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
55-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5655
TestConstant.ProjectType,"Maven",
5756
TestConstant.Mode,""}),
5857
"Test to run Package Identifier EXE execution");

src/SW360IntegrationTest/NPM/ComponentCreatorInitial.cs

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public void Setup()
4747
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
4848
TestConstant.JfrogNpmInternalRepo,"Npm-test",
4949
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
50-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5150
TestConstant.ProjectType, "NPM",
5251
TestConstant.Mode,""});
5352
}

src/SW360IntegrationTest/NPM/ComponentCreatorTestMode.cs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public void Setup()
4545
TestConstant.JFrogApiURL, testParameters.JfrogApi,
4646
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
4747
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
48-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
4948
TestConstant.ProjectType, "NPM",
5049
TestConstant.Mode,"test"
5150
});

src/SW360IntegrationTest/NPM/ComponentCreatorWithUpdatedComponents.cs

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public void Setup()
5050
TestConstant.JFrogApiURL, testParameters.JfrogApi,
5151
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
5252
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
53-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5453
TestConstant.ProjectType, "NPM",
5554
TestConstant.Mode,"" });
5655
}

src/SW360IntegrationTest/NPM/PackageIdentifierInitial.cs

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public void TestBOMCreatorexe()
5353
TestConstant.JfrogNpmInternalRepo,"Npm-test",
5454
TestConstant.ProjectType, "Npm",
5555
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
56-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5756
TestConstant.Mode,""}),
5857
"Test to run Package Identifier EXE execution");
5958
}

src/SW360IntegrationTest/NPM/PackageIdentifierInitialTestMode.cs

-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ public void TestBOMCreatorexe()
102102
TestConstant.JFrogApiURL, testParameters.JfrogApi,
103103
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
104104
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
105-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
106105
TestConstant.ProjectType, "NPM",
107106
TestConstant.Mode,"test"
108107
}),

src/SW360IntegrationTest/NPM/PackageIdentifierWithMultiplePackageLockInputs.cs

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public void TestBOMCreatorexe()
5151
TestConstant.JFrogApiURL, testParameters.JfrogApi,
5252
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
5353
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
54-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5554
TestConstant.JfrogNpmInternalRepo,"Npm-test",
5655
TestConstant.ProjectType, "NPM",
5756
TestConstant.Mode,""}),

src/SW360IntegrationTest/NPM/PackageIdentifierWithUpdatedComponents.cs

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public void TestBOMCreatorexe()
5151
TestConstant.JFrogApiURL, testParameters.JfrogApi,
5252
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
5353
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
54-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5554
TestConstant.JfrogNpmInternalRepo,"Npm-test",
5655
TestConstant.ProjectType, "NPM",
5756
TestConstant.Mode,"" }), "Test to run Package Identifier EXE execution");

src/SW360IntegrationTest/Nuget/ComponentCreatorInitialNuget.cs

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public void Setup()
4747
TestConstant.JfrogNugetInternalRepo,"Nuget-test",
4848
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
4949
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
50-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5150
TestConstant.ProjectType,"NUGET",
5251
TestConstant.Mode,""});
5352
}

src/SW360IntegrationTest/Nuget/NugetTemplate/ComponentCreatorNugetTemplate.cs

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public void Setup()
4747
TestConstant.JFrogApiURL, testParameters.JfrogApi,
4848
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
4949
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
50-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5150
TestConstant.JfrogNugetInternalRepo,"Nuget-test",
5251
TestConstant.ProjectType,"NUGET",
5352
TestConstant.Mode,""});

src/SW360IntegrationTest/Nuget/NugetTemplate/PackageIdentifierNugetTemplate.cs

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()
5252
TestConstant.JFrogApiURL, testParameters.JfrogApi,
5353
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
5454
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
55-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5655
TestConstant.JfrogNugetInternalRepo,"Nuget-test",
5756
TestConstant.ProjectType,"NUGET",
5857
TestConstant.Mode,""}),

src/SW360IntegrationTest/Nuget/PackageIdentifierInitialNuget.cs

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()
5151
TestConstant.JFrogApiURL, testParameters.JfrogApi,
5252
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
5353
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
54-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5554
TestConstant.JfrogNugetInternalRepo,"Nuget-test",
5655
TestConstant.ProjectType,"Nuget",
5756
TestConstant.Mode,""}),

src/SW360IntegrationTest/Python/ComponentCreatorInitialPython.cs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public void Setup()
4545
TestConstant.JFrogApiURL, testParameters.JfrogApi,
4646
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
4747
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
48-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
4948
TestConstant.JfrogPoetryInternalRepo,"Pypi-test",
5049
TestConstant.ProjectType,"POETRY",
5150
TestConstant.Mode,""});

src/SW360IntegrationTest/Python/PackageIdentifierInitialPython.cs

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()
5151
TestConstant.JFrogApiURL, testParameters.JfrogApi,
5252
TestConstant.ArtifactoryKey, testParameters.ArtifactoryUploadApiKey,
5353
TestConstant.TelemetryEnable, testParameters.TelemetryEnable,
54-
TestConstant.BasicSBOM, testParameters.BasicSBOM,
5554
TestConstant.JfrogPoetryInternalRepo,"Pypi-test",
5655
TestConstant.ProjectType,"Poetry",
5756
TestConstant.Mode,""}),

src/TestUtilities/TestParam.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public class TestParam
3030
public string InternalDestinationRepoName { get; set; }
3131
public string DevDestinationRepoName { get; set; }
3232
public string FossologyTrigger { get; set; }
33-
public string TelemetryEnable { get; set; }
34-
public string BasicSBOM { get; set; }
33+
public string TelemetryEnable { get; set; }
3534
public string BasicSBOMEnable { get; set; }
3635

3736
public TestParam()
@@ -51,8 +50,7 @@ public TestParam()
5150
InternalDestinationRepoName = "npm-test";
5251
DevDestinationRepoName = "npm-test";
5352
FossologyTrigger = s_Config["EnableFossologyTrigger"];
54-
TelemetryEnable = s_Config["TelemetryEnable"];
55-
BasicSBOM = s_Config["BasicSBOM"];
53+
TelemetryEnable = s_Config["TelemetryEnable"];
5654
BasicSBOMEnable = s_Config["BasicSBOMEnable"];
5755
}
5856
}

src/TestUtilities/TestParamAlpine.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ public class TestParamAlpine
2424
public string ArtifactoryUploadApiKey { get; set; }
2525
public string JfrogApi { get; set; }
2626
public string FossologyTrigger { get; set; }
27-
public string TelemetryEnable { get; set; }
28-
public string BasicSBOM { get; set; }
27+
public string TelemetryEnable { get; set; }
2928
public string BasicSBOMEnable { get; set; }
3029
public TestParamAlpine()
3130
{
@@ -42,7 +41,6 @@ public TestParamAlpine()
4241
RemoveDevDependency = s_Config["RemoveDevDependency"];
4342
FossologyTrigger = s_Config["EnableFossologyTrigger"];
4443
TelemetryEnable = s_Config["TelemetryEnable"];
45-
BasicSBOM = s_Config["BasicSBOM"];
4644
BasicSBOMEnable = s_Config["BasicSBOMEnable"];
4745
}
4846
}

src/TestUtilities/TestParamConan.cs

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class TestParamConan
3030
public string DevDestinationRepoName { get; set; }
3131
public string FossologyTrigger { get; set; }
3232
public string TelemetryEnable { get; set; }
33-
public string BasicSBOM { get; set; }
3433
public string BasicSBOMEnable { get; set; }
3534
public TestParamConan()
3635
{
@@ -50,7 +49,6 @@ public TestParamConan()
5049
DevDestinationRepoName = "conan-test";
5150
FossologyTrigger = s_Config["EnableFossologyTrigger"];
5251
TelemetryEnable = s_Config["TelemetryEnable"];
53-
BasicSBOM = s_Config["BasicSBOM"];
5452
BasicSBOMEnable = s_Config["BasicSBOMEnable"];
5553
}
5654
}

src/TestUtilities/TestParamDebian.cs

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public class TestParamDebian
2525
public string JfrogApi { get; set; }
2626
public string FossologyTrigger { get; set; }
2727
public string TelemetryEnable { get; set; }
28-
public string BasicSBOM { get; set; }
2928
public string BasicSBOMEnable { get; set; }
3029

3130
public TestParamDebian()
@@ -43,7 +42,6 @@ public TestParamDebian()
4342
RemoveDevDependency = s_Config["RemoveDevDependency"];
4443
FossologyTrigger = s_Config["EnableFossologyTrigger"];
4544
TelemetryEnable = s_Config["TelemetryEnable"];
46-
BasicSBOM = s_Config["BasicSBOM"];
4745
BasicSBOMEnable = s_Config["BasicSBOMEnable"];
4846
}
4947
}

src/TestUtilities/TestParamMaven.cs

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class TestParamMaven
3030
public string DevDestinationRepoName { get; set; }
3131
public string FossologyTrigger { get; set; }
3232
public string TelemetryEnable { get; set; }
33-
public string BasicSBOM { get; set; }
3433
public string BasicSBOMEnable { get; set; }
3534

3635
public TestParamMaven()
@@ -51,7 +50,6 @@ public TestParamMaven()
5150
DevDestinationRepoName = "maven-test";
5251
FossologyTrigger = s_Config["EnableFossologyTrigger"];
5352
TelemetryEnable = s_Config["TelemetryEnable"];
54-
BasicSBOM = s_Config["BasicSBOM"];
5553
BasicSBOMEnable = s_Config["BasicSBOMEnable"];
5654
}
5755
}

src/TestUtilities/TestParamNuget.cs

-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public class TestParamNuget
3434
public string DevDestinationRepoName { get; set; }
3535
public string FossologyTrigger { get; set; }
3636
public string TelemetryEnable { get; set; }
37-
public string BasicSBOM { get; set; }
3837
public string BasicSBOMEnable { get; set; }
3938

4039
public TestParamNuget()
@@ -55,7 +54,6 @@ public TestParamNuget()
5554
DevDestinationRepoName = "nuget-test";
5655
FossologyTrigger = s_Config["EnableFossologyTrigger"];
5756
TelemetryEnable = s_Config["TelemetryEnable"];
58-
BasicSBOM = s_Config["BasicSBOM"];
5957
BasicSBOMEnable = s_Config["BasicSBOMEnable"];
6058
}
6159
}

src/TestUtilities/appSettingsSW360IntegrationTest.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"BasicSBOM": false,
32
"Fossologyurl": "",
43
"RemoveDevDependency": true,
54
"EnableFossologyTrigger": false,

0 commit comments

Comments
 (0)