From 12a5f88755c3df962a0989a2f20480d4fe35f503 Mon Sep 17 00:00:00 2001 From: jraihan <jahid.raihan@dsinnovators.com> Date: Mon, 16 Oct 2023 14:53:50 +0600 Subject: [PATCH 1/4] changed package name as per jenkins infra team feedback. --- pom.xml | 2 +- .../scan/PluginParametersHandler.java | 25 +++++++------ .../security}/scan/SecurityScanner.java | 15 ++++---- .../security}/scan/bridge/BridgeDownload.java | 12 +++--- .../scan/bridge/BridgeDownloadManager.java | 12 +++--- .../scan/bridge/BridgeDownloadParameters.java | 4 +- .../security}/scan/bridge/BridgeInstall.java | 10 ++--- .../exception/PluginExceptionHandler.java | 2 +- .../scan/exception/ScannerException.java | 2 +- .../extension/global/ScannerGlobalConfig.java | 2 +- .../extension/pipeline/SecurityScanStep.java | 18 ++++----- .../scan/factory/ScanParametersFactory.java | 20 +++++----- .../scan/global/ApplicationConstants.java | 2 +- .../security}/scan/global/BridgeParams.java | 2 +- .../scan/global/ExceptionMessages.java | 2 +- .../scan/global/HomeDirectoryTask.java | 2 +- .../security}/scan/global/LogMessages.java | 2 +- .../security}/scan/global/LoggerWrapper.java | 2 +- .../security}/scan/global/OsNameTask.java | 2 +- .../security}/scan/global/Utility.java | 2 +- .../scan/global/enums/SecurityProduct.java | 2 +- .../security}/scan/input/BridgeInput.java | 10 ++--- .../security}/scan/input/NetworkAirGap.java | 2 +- .../security}/scan/input/bitbucket/Api.java | 2 +- .../scan/input/bitbucket/Bitbucket.java | 2 +- .../scan/input/bitbucket/Project.java | 2 +- .../security}/scan/input/bitbucket/Pull.java | 2 +- .../scan/input/bitbucket/Repository.java | 2 +- .../scan/input/blackduck/Automation.java | 2 +- .../scan/input/blackduck/BlackDuck.java | 2 +- .../scan/input/blackduck/Download.java | 2 +- .../scan/input/blackduck/Failure.java | 2 +- .../scan/input/blackduck/Install.java | 2 +- .../security}/scan/input/blackduck/Scan.java | 2 +- .../scan/input/coverity/Automation.java | 2 +- .../scan/input/coverity/Connect.java | 2 +- .../scan/input/coverity/Coverity.java | 4 +- .../security}/scan/input/coverity/Policy.java | 2 +- .../scan/input/coverity/Project.java | 2 +- .../security}/scan/input/coverity/Stream.java | 2 +- .../security}/scan/input/coverity/User.java | 2 +- .../scan/input/polaris/ApplicationName.java | 2 +- .../scan/input/polaris/AssessmentTypes.java | 2 +- .../security}/scan/input/polaris/Branch.java | 2 +- .../security}/scan/input/polaris/Polaris.java | 2 +- .../scan/input/polaris/ProjectName.java | 2 +- .../scan/service/ScannerArgumentService.java | 37 ++++++++++--------- .../BridgeDownloadParametersService.java | 12 +++--- .../diagnostics/DiagnosticsService.java | 4 +- .../service/scan/ScanParametersService.java | 13 ++++--- .../blackduck/BlackDuckParametersService.java | 12 +++--- .../coverity/CoverityParametersService.java | 10 ++--- .../polaris/PolarisParametersService.java | 10 ++--- .../scm/BitbucketRepositoryService.java | 23 ++++++------ .../service/scm/SCMRepositoryService.java | 7 ++-- .../global/ScannerGlobalConfig/config.jelly | 0 .../help-bitbucketToken.html | 0 .../help-blackDuckApiToken.html | 0 .../help-blackDuckInstallationPath.html | 0 .../help-blackDuckUrl.html | 0 .../help-coverityConnectUrl.html | 0 .../help-coverityConnectUserName.html | 0 .../help-coverityConnectUserPassword.html | 0 .../help-coverityInstallationPath.html | 0 .../help-polarisAccessToken.html | 0 .../help-polarisServerUrl.html | 0 ...elp-synopsysBridgeDownloadUrlForLinux.html | 0 .../help-synopsysBridgeDownloadUrlForMac.html | 0 ...p-synopsysBridgeDownloadUrlForWindows.html | 0 .../help-synopsysBridgeInstallationPath.html | 0 .../help-synopsysBridgeVersion.html | 0 .../pipeline/SecurityScanStep/config.jelly | 0 .../help-blackduck_automation_prcomment.html | 0 .../help-blackduck_download_url.html | 0 ...elp-blackduck_scan_failure_severities.html | 0 .../help-blackduck_scan_full.html | 0 .../help-coverity_automation_prcomment.html | 0 .../SecurityScanStep/help-coverity_local.html | 0 .../help-coverity_policy_view.html | 0 .../help-coverity_project_name.html | 0 .../help-coverity_stream_name.html | 0 .../help-coverity_version.html | 0 .../help-include_diagnostics.html | 0 .../SecurityScanStep/help-network_airgap.html | 0 .../help-polaris_application_name.html | 0 .../help-polaris_assessment_types.html | 0 .../help-polaris_branch_name.html | 0 .../help-polaris_project_name.html | 0 .../SecurityScanStep/help-polaris_triage.html | 0 .../SecurityScanStep/help-product.html | 0 .../scan/PluginParametersHandlerTest.java | 10 ++--- .../bridge/BridgeDownloadManagerTest.java | 4 +- .../scan/bridge/BridgeDownloadTest.java | 8 ++-- .../scan/bridge/BridgeInstallTest.java | 2 +- .../factory/ScanParametersFactoryTest.java | 8 ++-- .../security}/scan/global/UtilityTest.java | 2 +- .../service/ScannerArgumentServiceTest.java | 20 +++++----- .../BridgeDownloadParameterServiceTest.java | 6 +-- .../diagnostics/DiagnosticsServiceTest.java | 4 +- .../scan/ScanParametersServiceTest.java | 4 +- .../BlackDuckParametersServiceTest.java | 6 +-- .../CoverityParametersServiceTest.java | 6 +-- .../polaris/PolarisParametersServiceTest.java | 6 +-- .../scm/BitbucketRepositoryServiceTest.java | 8 ++-- 104 files changed, 215 insertions(+), 209 deletions(-) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/PluginParametersHandler.java (90%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/SecurityScanner.java (85%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/bridge/BridgeDownload.java (92%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/bridge/BridgeDownloadManager.java (95%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/bridge/BridgeDownloadParameters.java (92%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/bridge/BridgeInstall.java (88%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/exception/PluginExceptionHandler.java (92%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/exception/ScannerException.java (88%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig.java (98%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep.java (95%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/factory/ScanParametersFactory.java (95%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/global/ApplicationConstants.java (98%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/global/BridgeParams.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/global/ExceptionMessages.java (95%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/global/HomeDirectoryTask.java (92%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/global/LogMessages.java (97%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/global/LoggerWrapper.java (95%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/global/OsNameTask.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/global/Utility.java (99%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/global/enums/SecurityProduct.java (82%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/BridgeInput.java (80%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/NetworkAirGap.java (90%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/bitbucket/Api.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/bitbucket/Bitbucket.java (92%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/bitbucket/Project.java (92%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/bitbucket/Pull.java (88%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/bitbucket/Repository.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/blackduck/Automation.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/blackduck/BlackDuck.java (96%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/blackduck/Download.java (87%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/blackduck/Failure.java (89%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/blackduck/Install.java (88%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/blackduck/Scan.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/coverity/Automation.java (89%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/coverity/Connect.java (95%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/coverity/Coverity.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/coverity/Policy.java (88%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/coverity/Project.java (88%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/coverity/Stream.java (88%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/coverity/User.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/polaris/ApplicationName.java (88%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/polaris/AssessmentTypes.java (89%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/polaris/Branch.java (92%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/polaris/Polaris.java (97%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/input/polaris/ProjectName.java (88%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/ScannerArgumentService.java (87%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/bridge/BridgeDownloadParametersService.java (93%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/diagnostics/DiagnosticsService.java (92%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scan/ScanParametersService.java (81%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scan/blackduck/BlackDuckParametersService.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scan/coverity/CoverityParametersService.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scan/polaris/PolarisParametersService.java (91%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scm/BitbucketRepositoryService.java (80%) rename src/main/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scm/SCMRepositoryService.java (90%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/config.jelly (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-bitbucketToken.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-blackDuckApiToken.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-blackDuckInstallationPath.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-blackDuckUrl.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUrl.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUserName.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUserPassword.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-coverityInstallationPath.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-polarisAccessToken.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-polarisServerUrl.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForLinux.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForMac.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForWindows.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeInstallationPath.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeVersion.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/config.jelly (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-blackduck_automation_prcomment.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-blackduck_download_url.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-blackduck_scan_failure_severities.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-blackduck_scan_full.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-coverity_automation_prcomment.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-coverity_local.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-coverity_policy_view.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-coverity_project_name.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-coverity_stream_name.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-coverity_version.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-include_diagnostics.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-network_airgap.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-polaris_application_name.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-polaris_assessment_types.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-polaris_branch_name.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-polaris_project_name.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-polaris_triage.html (100%) rename src/main/resources/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/extension/pipeline/SecurityScanStep/help-product.html (100%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/PluginParametersHandlerTest.java (90%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/bridge/BridgeDownloadManagerTest.java (98%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/bridge/BridgeDownloadTest.java (92%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/bridge/BridgeInstallTest.java (98%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/factory/ScanParametersFactoryTest.java (97%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/global/UtilityTest.java (99%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/ScannerArgumentServiceTest.java (94%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/bridge/BridgeDownloadParameterServiceTest.java (96%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/diagnostics/DiagnosticsServiceTest.java (95%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scan/ScanParametersServiceTest.java (95%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java (94%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scan/coverity/CoverityParametersServiceTest.java (93%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scan/polaris/PolarisParametersServiceTest.java (94%) rename src/test/java/{com/synopsys/integration/jenkins => io/jenkins/plugins/synopsys/security}/scan/service/scm/BitbucketRepositoryServiceTest.java (93%) diff --git a/pom.xml b/pom.xml index 1243b87b..9044ea9e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ --> <jenkins.version>2.401.3</jenkins.version> <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo> - <spotless.check.skip>true</spotless.check.skip> + <spotless.check.skip>false</spotless.check.skip> </properties> <dependencyManagement> diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/PluginParametersHandler.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java similarity index 90% rename from src/main/java/com/synopsys/integration/jenkins/scan/PluginParametersHandler.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java index ec48f13b..df951dfa 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/PluginParametersHandler.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java @@ -5,21 +5,22 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan; - -import com.synopsys.integration.jenkins.scan.bridge.BridgeDownloadManager; -import com.synopsys.integration.jenkins.scan.bridge.BridgeDownloadParameters; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.exception.ScannerException; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.ExceptionMessages; -import com.synopsys.integration.jenkins.scan.global.LogMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.service.bridge.BridgeDownloadParametersService; -import com.synopsys.integration.jenkins.scan.service.scan.ScanParametersService; +package io.jenkins.plugins.synopsys.security.scan; + +import io.jenkins.plugins.synopsys.security.scan.bridge.BridgeDownloadManager; +import io.jenkins.plugins.synopsys.security.scan.bridge.BridgeDownloadParameters; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.exception.ScannerException; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.ExceptionMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.service.bridge.BridgeDownloadParametersService; +import io.jenkins.plugins.synopsys.security.scan.service.scan.ScanParametersService; import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; + import java.util.Map; import java.util.Set; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/SecurityScanner.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java similarity index 85% rename from src/main/java/com/synopsys/integration/jenkins/scan/SecurityScanner.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java index bd318dde..8abe7f09 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/SecurityScanner.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java @@ -5,20 +5,21 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan; +package io.jenkins.plugins.synopsys.security.scan; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.LogMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.service.ScannerArgumentService; -import com.synopsys.integration.jenkins.scan.service.diagnostics.DiagnosticsService; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.service.ScannerArgumentService; +import io.jenkins.plugins.synopsys.security.scan.service.diagnostics.DiagnosticsService; import hudson.EnvVars; import hudson.FilePath; import hudson.Launcher; import hudson.model.Run; import hudson.model.TaskListener; import hudson.tasks.ArtifactArchiver; + import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownload.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java similarity index 92% rename from src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownload.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java index ad47fb40..1f46c0e7 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownload.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java @@ -5,13 +5,13 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.bridge; +package io.jenkins.plugins.synopsys.security.scan.bridge; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.LogMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.global.Utility; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadManager.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java similarity index 95% rename from src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadManager.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java index c48935ca..3e5cfe7d 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadManager.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java @@ -5,13 +5,13 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.bridge; +package io.jenkins.plugins.synopsys.security.scan.bridge; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.LogMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.global.Utility; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadParameters.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java similarity index 92% rename from src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadParameters.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java index 54102700..89f7a887 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadParameters.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java @@ -5,9 +5,9 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.bridge; +package io.jenkins.plugins.synopsys.security.scan.bridge; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import hudson.FilePath; import hudson.model.TaskListener; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeInstall.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java similarity index 88% rename from src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeInstall.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java index 53f40147..5bd9e007 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeInstall.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java @@ -5,12 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.bridge; +package io.jenkins.plugins.synopsys.security.scan.bridge; -import com.synopsys.integration.jenkins.scan.global.HomeDirectoryTask; -import com.synopsys.integration.jenkins.scan.global.LogMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.global.Utility; +import io.jenkins.plugins.synopsys.security.scan.global.HomeDirectoryTask; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; import hudson.FilePath; import hudson.model.TaskListener; import jenkins.model.Jenkins; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/exception/PluginExceptionHandler.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/PluginExceptionHandler.java similarity index 92% rename from src/main/java/com/synopsys/integration/jenkins/scan/exception/PluginExceptionHandler.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/PluginExceptionHandler.java index e42083bb..ed370c7e 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/exception/PluginExceptionHandler.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/PluginExceptionHandler.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.exception; +package io.jenkins.plugins.synopsys.security.scan.exception; public class PluginExceptionHandler extends Exception { private static final long serialVersionUID = 3172941819259598261L; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/exception/ScannerException.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/ScannerException.java similarity index 88% rename from src/main/java/com/synopsys/integration/jenkins/scan/exception/ScannerException.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/ScannerException.java index cbb64926..6dbfb73b 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/exception/ScannerException.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/ScannerException.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.exception; +package io.jenkins.plugins.synopsys.security.scan.exception; public class ScannerException extends Exception { private static final long serialVersionUID = 3172941819259598261L; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java similarity index 98% rename from src/main/java/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java index 2689c0fe..a84c6777 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.extension.global; +package io.jenkins.plugins.synopsys.security.scan.extension.global; import hudson.Extension; import java.io.Serializable; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java similarity index 95% rename from src/main/java/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java index b7138d36..48515fbd 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java @@ -5,15 +5,15 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.extension.pipeline; - -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.exception.ScannerException; -import com.synopsys.integration.jenkins.scan.factory.ScanParametersFactory; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.ExceptionMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.global.enums.SecurityProduct; +package io.jenkins.plugins.synopsys.security.scan.extension.pipeline; + +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.exception.ScannerException; +import io.jenkins.plugins.synopsys.security.scan.factory.ScanParametersFactory; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.ExceptionMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.global.enums.SecurityProduct; import hudson.*; import hudson.model.Node; import hudson.model.Run; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/factory/ScanParametersFactory.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java similarity index 95% rename from src/main/java/com/synopsys/integration/jenkins/scan/factory/ScanParametersFactory.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java index aebda6cf..0169c53a 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/factory/ScanParametersFactory.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java @@ -5,16 +5,16 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.factory; - -import com.synopsys.integration.jenkins.scan.PluginParametersHandler; -import com.synopsys.integration.jenkins.scan.SecurityScanner; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.extension.global.ScannerGlobalConfig; -import com.synopsys.integration.jenkins.scan.extension.pipeline.SecurityScanStep; -import com.synopsys.integration.jenkins.scan.global.*; -import com.synopsys.integration.jenkins.scan.global.enums.SecurityProduct; -import com.synopsys.integration.jenkins.scan.service.ScannerArgumentService; +package io.jenkins.plugins.synopsys.security.scan.factory; + +import io.jenkins.plugins.synopsys.security.scan.PluginParametersHandler; +import io.jenkins.plugins.synopsys.security.scan.SecurityScanner; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.extension.global.ScannerGlobalConfig; +import io.jenkins.plugins.synopsys.security.scan.extension.pipeline.SecurityScanStep; +import io.jenkins.plugins.synopsys.security.scan.global.*; +import io.jenkins.plugins.synopsys.security.scan.global.enums.SecurityProduct; +import io.jenkins.plugins.synopsys.security.scan.service.ScannerArgumentService; import hudson.AbortException; import hudson.EnvVars; import hudson.FilePath; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/global/ApplicationConstants.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java similarity index 98% rename from src/main/java/com/synopsys/integration/jenkins/scan/global/ApplicationConstants.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java index fe4bf786..32120005 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/global/ApplicationConstants.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.global; +package io.jenkins.plugins.synopsys.security.scan.global; public class ApplicationConstants { public static final String DISPLAY_NAME = "Synopsys Security Scan"; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/global/BridgeParams.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/global/BridgeParams.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java index 0a291b94..74a4754f 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/global/BridgeParams.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.global; +package io.jenkins.plugins.synopsys.security.scan.global; public class BridgeParams { public static final String STAGE_OPTION = "--stage"; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/global/ExceptionMessages.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ExceptionMessages.java similarity index 95% rename from src/main/java/com/synopsys/integration/jenkins/scan/global/ExceptionMessages.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ExceptionMessages.java index 5771f7eb..8aef93d6 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/global/ExceptionMessages.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ExceptionMessages.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.global; +package io.jenkins.plugins.synopsys.security.scan.global; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/global/HomeDirectoryTask.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java similarity index 92% rename from src/main/java/com/synopsys/integration/jenkins/scan/global/HomeDirectoryTask.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java index 598d7323..ddeb71ae 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/global/HomeDirectoryTask.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.global; +package io.jenkins.plugins.synopsys.security.scan.global; import hudson.remoting.VirtualChannel; import java.io.File; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/global/LogMessages.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java similarity index 97% rename from src/main/java/com/synopsys/integration/jenkins/scan/global/LogMessages.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java index deb1c175..77a40fdf 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/global/LogMessages.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.global; +package io.jenkins.plugins.synopsys.security.scan.global; public class LogMessages { public static final String ASTERISKS = "******************************************************************************"; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/global/LoggerWrapper.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java similarity index 95% rename from src/main/java/com/synopsys/integration/jenkins/scan/global/LoggerWrapper.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java index 11cf7c94..a8a157d4 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/global/LoggerWrapper.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.global; +package io.jenkins.plugins.synopsys.security.scan.global; import hudson.model.TaskListener; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/global/OsNameTask.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/global/OsNameTask.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java index 7249c5cc..468f0f5d 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/global/OsNameTask.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.global; +package io.jenkins.plugins.synopsys.security.scan.global; import hudson.FilePath; import hudson.remoting.VirtualChannel; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/global/Utility.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java similarity index 99% rename from src/main/java/com/synopsys/integration/jenkins/scan/global/Utility.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java index f6d67fb9..912585bf 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/global/Utility.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.global; +package io.jenkins.plugins.synopsys.security.scan.global; import hudson.EnvVars; import hudson.FilePath; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/global/enums/SecurityProduct.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/enums/SecurityProduct.java similarity index 82% rename from src/main/java/com/synopsys/integration/jenkins/scan/global/enums/SecurityProduct.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/global/enums/SecurityProduct.java index e0bf9b94..b6be1f17 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/global/enums/SecurityProduct.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/enums/SecurityProduct.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.global.enums; +package io.jenkins.plugins.synopsys.security.scan.global.enums; public enum SecurityProduct { BLACKDUCK, diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/BridgeInput.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/BridgeInput.java similarity index 80% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/BridgeInput.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/BridgeInput.java index a05ecaec..8a79a17d 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/BridgeInput.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/BridgeInput.java @@ -5,13 +5,13 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input; +package io.jenkins.plugins.synopsys.security.scan.input; import com.fasterxml.jackson.annotation.JsonProperty; -import com.synopsys.integration.jenkins.scan.input.bitbucket.Bitbucket; -import com.synopsys.integration.jenkins.scan.input.blackduck.BlackDuck; -import com.synopsys.integration.jenkins.scan.input.coverity.Coverity; -import com.synopsys.integration.jenkins.scan.input.polaris.Polaris; +import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Bitbucket; +import io.jenkins.plugins.synopsys.security.scan.input.blackduck.BlackDuck; +import io.jenkins.plugins.synopsys.security.scan.input.coverity.Coverity; +import io.jenkins.plugins.synopsys.security.scan.input.polaris.Polaris; public class BridgeInput { @JsonProperty("blackduck") diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/NetworkAirGap.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/NetworkAirGap.java similarity index 90% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/NetworkAirGap.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/NetworkAirGap.java index e684691f..128cf2b5 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/NetworkAirGap.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/NetworkAirGap.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input; +package io.jenkins.plugins.synopsys.security.scan.input; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Api.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Api.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Api.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Api.java index 04361c3e..afe26d09 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Api.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Api.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.bitbucket; +package io.jenkins.plugins.synopsys.security.scan.input.bitbucket; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Bitbucket.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Bitbucket.java similarity index 92% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Bitbucket.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Bitbucket.java index 478b3f41..d7d519b3 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Bitbucket.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Bitbucket.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.bitbucket; +package io.jenkins.plugins.synopsys.security.scan.input.bitbucket; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Project.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Project.java similarity index 92% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Project.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Project.java index e4132d56..d322775d 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Project.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Project.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.bitbucket; +package io.jenkins.plugins.synopsys.security.scan.input.bitbucket; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Pull.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Pull.java similarity index 88% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Pull.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Pull.java index 147112d8..1fcd867f 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Pull.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Pull.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.bitbucket; +package io.jenkins.plugins.synopsys.security.scan.input.bitbucket; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Repository.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Repository.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Repository.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Repository.java index 8b1f82ee..12e4e97b 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/bitbucket/Repository.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Repository.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.bitbucket; +package io.jenkins.plugins.synopsys.security.scan.input.bitbucket; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Automation.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Automation.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java index 2a538424..a0ceb1eb 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Automation.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.blackduck; +package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/BlackDuck.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/BlackDuck.java similarity index 96% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/BlackDuck.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/BlackDuck.java index 63da78da..f8ebf859 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/BlackDuck.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/BlackDuck.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.blackduck; +package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Download.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Download.java similarity index 87% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Download.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Download.java index b4982429..4dd88d82 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Download.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Download.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.blackduck; +package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Failure.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Failure.java similarity index 89% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Failure.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Failure.java index c91040eb..03e2218c 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Failure.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Failure.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.blackduck; +package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Install.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Install.java similarity index 88% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Install.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Install.java index 1452fbc9..28cd84af 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Install.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Install.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.blackduck; +package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Scan.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Scan.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java index 86fce322..a0352324 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/blackduck/Scan.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.blackduck; +package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Automation.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Automation.java similarity index 89% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Automation.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Automation.java index 0644f495..56a130c0 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Automation.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Automation.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.coverity; +package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Connect.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java similarity index 95% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Connect.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java index 284b2b33..32d827c6 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Connect.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.coverity; +package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Coverity.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Coverity.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java index c49387e9..afd87463 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Coverity.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java @@ -5,10 +5,10 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.coverity; +package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; -import com.synopsys.integration.jenkins.scan.input.blackduck.Install; +import io.jenkins.plugins.synopsys.security.scan.input.blackduck.Install; public class Coverity { @JsonProperty("connect") diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Policy.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Policy.java similarity index 88% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Policy.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Policy.java index 6dc62896..3b03c2c4 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Policy.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Policy.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.coverity; +package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Project.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Project.java similarity index 88% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Project.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Project.java index ddf9c15f..5ecb661c 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Project.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Project.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.coverity; +package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Stream.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Stream.java similarity index 88% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Stream.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Stream.java index f0f0af01..c53ae991 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/Stream.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Stream.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.coverity; +package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/User.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/User.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/User.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/User.java index 0104fe88..ef250ce5 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/coverity/User.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/User.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.coverity; +package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/ApplicationName.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java similarity index 88% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/ApplicationName.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java index 7952a4a6..e74d6a56 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/ApplicationName.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.polaris; +package io.jenkins.plugins.synopsys.security.scan.input.polaris; import com.fasterxml.jackson.annotation.JsonProperty; public class ApplicationName { diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/AssessmentTypes.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/AssessmentTypes.java similarity index 89% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/AssessmentTypes.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/AssessmentTypes.java index e1671135..27775d8f 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/AssessmentTypes.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/AssessmentTypes.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.polaris; +package io.jenkins.plugins.synopsys.security.scan.input.polaris; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/Branch.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java similarity index 92% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/Branch.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java index 4be7758c..81616307 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/Branch.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.polaris; +package io.jenkins.plugins.synopsys.security.scan.input.polaris; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/Polaris.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Polaris.java similarity index 97% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/Polaris.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Polaris.java index e0c50170..d1b15a96 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/Polaris.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Polaris.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.polaris; +package io.jenkins.plugins.synopsys.security.scan.input.polaris; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/ProjectName.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ProjectName.java similarity index 88% rename from src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/ProjectName.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ProjectName.java index 9346df32..07f5bc11 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/input/polaris/ProjectName.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ProjectName.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.input.polaris; +package io.jenkins.plugins.synopsys.security.scan.input.polaris; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/service/ScannerArgumentService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java similarity index 87% rename from src/main/java/com/synopsys/integration/jenkins/scan/service/ScannerArgumentService.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java index ef59ad67..8a9fbe12 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/service/ScannerArgumentService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java @@ -5,30 +5,31 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.service; +package io.jenkins.plugins.synopsys.security.scan.service; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.BridgeParams; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.global.Utility; -import com.synopsys.integration.jenkins.scan.global.enums.SecurityProduct; -import com.synopsys.integration.jenkins.scan.input.BridgeInput; -import com.synopsys.integration.jenkins.scan.input.NetworkAirGap; -import com.synopsys.integration.jenkins.scan.input.bitbucket.Bitbucket; -import com.synopsys.integration.jenkins.scan.input.blackduck.BlackDuck; -import com.synopsys.integration.jenkins.scan.input.coverity.Coverity; -import com.synopsys.integration.jenkins.scan.input.polaris.Polaris; -import com.synopsys.integration.jenkins.scan.service.scan.ScanParametersService; -import com.synopsys.integration.jenkins.scan.service.scan.blackduck.BlackDuckParametersService; -import com.synopsys.integration.jenkins.scan.service.scan.coverity.CoverityParametersService; -import com.synopsys.integration.jenkins.scan.service.scan.polaris.PolarisParametersService; -import com.synopsys.integration.jenkins.scan.service.scm.SCMRepositoryService; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.BridgeParams; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; +import io.jenkins.plugins.synopsys.security.scan.global.enums.SecurityProduct; +import io.jenkins.plugins.synopsys.security.scan.input.BridgeInput; +import io.jenkins.plugins.synopsys.security.scan.input.NetworkAirGap; +import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Bitbucket; +import io.jenkins.plugins.synopsys.security.scan.input.blackduck.BlackDuck; +import io.jenkins.plugins.synopsys.security.scan.input.coverity.Coverity; +import io.jenkins.plugins.synopsys.security.scan.input.polaris.Polaris; +import io.jenkins.plugins.synopsys.security.scan.service.scan.ScanParametersService; +import io.jenkins.plugins.synopsys.security.scan.service.scan.blackduck.BlackDuckParametersService; +import io.jenkins.plugins.synopsys.security.scan.service.scan.coverity.CoverityParametersService; +import io.jenkins.plugins.synopsys.security.scan.service.scan.polaris.PolarisParametersService; +import io.jenkins.plugins.synopsys.security.scan.service.scm.SCMRepositoryService; import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; + import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/service/bridge/BridgeDownloadParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java similarity index 93% rename from src/main/java/com/synopsys/integration/jenkins/scan/service/bridge/BridgeDownloadParametersService.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java index 384b52cd..6a5ab763 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/service/bridge/BridgeDownloadParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java @@ -5,13 +5,13 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.service.bridge; +package io.jenkins.plugins.synopsys.security.scan.service.bridge; -import com.synopsys.integration.jenkins.scan.bridge.BridgeDownloadParameters; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.LogMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.global.Utility; +import io.jenkins.plugins.synopsys.security.scan.bridge.BridgeDownloadParameters; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; import hudson.FilePath; import hudson.model.TaskListener; import java.io.IOException; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/service/diagnostics/DiagnosticsService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java similarity index 92% rename from src/main/java/com/synopsys/integration/jenkins/scan/service/diagnostics/DiagnosticsService.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java index 6e85a09a..af323e4e 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/service/diagnostics/DiagnosticsService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java @@ -5,9 +5,9 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.service.diagnostics; +package io.jenkins.plugins.synopsys.security.scan.service.diagnostics; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import hudson.EnvVars; import hudson.FilePath; import hudson.Launcher; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/ScanParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java similarity index 81% rename from src/main/java/com/synopsys/integration/jenkins/scan/service/scan/ScanParametersService.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java index 5734f93e..0ffcabad 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/ScanParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java @@ -5,14 +5,15 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.service.scan; +package io.jenkins.plugins.synopsys.security.scan.service.scan; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.enums.SecurityProduct; -import com.synopsys.integration.jenkins.scan.service.scan.blackduck.BlackDuckParametersService; -import com.synopsys.integration.jenkins.scan.service.scan.coverity.CoverityParametersService; -import com.synopsys.integration.jenkins.scan.service.scan.polaris.PolarisParametersService; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.enums.SecurityProduct; +import io.jenkins.plugins.synopsys.security.scan.service.scan.blackduck.BlackDuckParametersService; +import io.jenkins.plugins.synopsys.security.scan.service.scan.coverity.CoverityParametersService; +import io.jenkins.plugins.synopsys.security.scan.service.scan.polaris.PolarisParametersService; import hudson.model.TaskListener; + import java.util.Arrays; import java.util.Map; import java.util.Set; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/blackduck/BlackDuckParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/service/scan/blackduck/BlackDuckParametersService.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java index e8b56a7b..10b1b096 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/blackduck/BlackDuckParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java @@ -5,13 +5,13 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.service.scan.blackduck; +package io.jenkins.plugins.synopsys.security.scan.service.scan.blackduck; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.LogMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.input.blackduck.BlackDuck; -import com.synopsys.integration.jenkins.scan.input.blackduck.Download; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.input.blackduck.BlackDuck; +import io.jenkins.plugins.synopsys.security.scan.input.blackduck.Download; import hudson.model.TaskListener; import java.util.*; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/coverity/CoverityParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/service/scan/coverity/CoverityParametersService.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java index e0adc92a..e72eddf3 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/coverity/CoverityParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java @@ -5,12 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.service.scan.coverity; +package io.jenkins.plugins.synopsys.security.scan.service.scan.coverity; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.LogMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.input.coverity.Coverity; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.input.coverity.Coverity; import hudson.model.TaskListener; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/polaris/PolarisParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java similarity index 91% rename from src/main/java/com/synopsys/integration/jenkins/scan/service/scan/polaris/PolarisParametersService.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java index 26349ce9..6b3e1721 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/polaris/PolarisParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java @@ -5,12 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.service.scan.polaris; +package io.jenkins.plugins.synopsys.security.scan.service.scan.polaris; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.LogMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.input.polaris.Polaris; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.input.polaris.Polaris; import hudson.model.TaskListener; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/service/scm/BitbucketRepositoryService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java similarity index 80% rename from src/main/java/com/synopsys/integration/jenkins/scan/service/scm/BitbucketRepositoryService.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java index 09865cf2..b083ee7a 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/service/scm/BitbucketRepositoryService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java @@ -5,20 +5,21 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.service.scm; +package io.jenkins.plugins.synopsys.security.scan.service.scm; import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource; import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketApi; import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.LogMessages; -import com.synopsys.integration.jenkins.scan.global.LoggerWrapper; -import com.synopsys.integration.jenkins.scan.global.Utility; -import com.synopsys.integration.jenkins.scan.input.bitbucket.Bitbucket; -import com.synopsys.integration.jenkins.scan.input.bitbucket.Pull; -import com.synopsys.integration.jenkins.scan.input.bitbucket.Repository; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; +import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Bitbucket; +import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Pull; +import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Repository; import hudson.model.TaskListener; + import java.util.Map; public class BitbucketRepositoryService { @@ -28,8 +29,8 @@ public BitbucketRepositoryService(TaskListener listener) { this.logger = new LoggerWrapper(listener); } - public Bitbucket fetchBitbucketRepositoryDetails(Map<String, Object> scanParameters, - BitbucketSCMSource bitbucketSCMSource, + public Bitbucket fetchBitbucketRepositoryDetails(Map<String, Object> scanParameters, + BitbucketSCMSource bitbucketSCMSource, Integer projectRepositoryPullNumber, boolean isFixPrOrPrComment) throws PluginExceptionHandler { diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/service/scm/SCMRepositoryService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java similarity index 90% rename from src/main/java/com/synopsys/integration/jenkins/scan/service/scm/SCMRepositoryService.java rename to src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java index 4888d8cc..35139be9 100644 --- a/src/main/java/com/synopsys/integration/jenkins/scan/service/scm/SCMRepositoryService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java @@ -5,14 +5,15 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.jenkins.scan.service.scm; +package io.jenkins.plugins.synopsys.security.scan.service.scm; import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import hudson.EnvVars; import hudson.model.TaskListener; import java.util.Map; + import jenkins.model.Jenkins; import jenkins.scm.api.SCMSource; import jenkins.scm.api.SCMSourceOwner; diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/config.jelly b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/config.jelly similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/config.jelly rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/config.jelly diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-bitbucketToken.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-bitbucketToken.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-bitbucketToken.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-bitbucketToken.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-blackDuckApiToken.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-blackDuckApiToken.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-blackDuckApiToken.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-blackDuckApiToken.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-blackDuckInstallationPath.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-blackDuckInstallationPath.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-blackDuckInstallationPath.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-blackDuckInstallationPath.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-blackDuckUrl.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-blackDuckUrl.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-blackDuckUrl.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-blackDuckUrl.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUrl.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUrl.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUrl.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUrl.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUserName.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUserName.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUserName.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUserName.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUserPassword.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUserPassword.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUserPassword.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-coverityConnectUserPassword.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-coverityInstallationPath.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-coverityInstallationPath.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-coverityInstallationPath.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-coverityInstallationPath.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-polarisAccessToken.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-polarisAccessToken.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-polarisAccessToken.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-polarisAccessToken.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-polarisServerUrl.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-polarisServerUrl.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-polarisServerUrl.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-polarisServerUrl.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForLinux.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForLinux.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForLinux.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForLinux.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForMac.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForMac.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForMac.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForMac.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForWindows.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForWindows.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForWindows.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeDownloadUrlForWindows.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeInstallationPath.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeInstallationPath.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeInstallationPath.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeInstallationPath.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeVersion.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeVersion.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeVersion.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig/help-synopsysBridgeVersion.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/config.jelly b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/config.jelly similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/config.jelly rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/config.jelly diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-blackduck_automation_prcomment.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-blackduck_automation_prcomment.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-blackduck_automation_prcomment.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-blackduck_automation_prcomment.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-blackduck_download_url.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-blackduck_download_url.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-blackduck_download_url.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-blackduck_download_url.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-blackduck_scan_failure_severities.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-blackduck_scan_failure_severities.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-blackduck_scan_failure_severities.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-blackduck_scan_failure_severities.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-blackduck_scan_full.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-blackduck_scan_full.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-blackduck_scan_full.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-blackduck_scan_full.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_automation_prcomment.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_automation_prcomment.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_automation_prcomment.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_automation_prcomment.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_local.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_local.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_local.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_local.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_policy_view.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_policy_view.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_policy_view.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_policy_view.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_project_name.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_project_name.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_project_name.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_project_name.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_stream_name.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_stream_name.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_stream_name.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_stream_name.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_version.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_version.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-coverity_version.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-coverity_version.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-include_diagnostics.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-include_diagnostics.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-include_diagnostics.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-include_diagnostics.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-network_airgap.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-network_airgap.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-network_airgap.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-network_airgap.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-polaris_application_name.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-polaris_application_name.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-polaris_application_name.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-polaris_application_name.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-polaris_assessment_types.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-polaris_assessment_types.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-polaris_assessment_types.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-polaris_assessment_types.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-polaris_branch_name.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-polaris_branch_name.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-polaris_branch_name.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-polaris_branch_name.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-polaris_project_name.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-polaris_project_name.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-polaris_project_name.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-polaris_project_name.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-polaris_triage.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-polaris_triage.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-polaris_triage.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-polaris_triage.html diff --git a/src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-product.html b/src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-product.html similarity index 100% rename from src/main/resources/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/help-product.html rename to src/main/resources/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep/help-product.html diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/PluginParametersHandlerTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandlerTest.java similarity index 90% rename from src/test/java/com/synopsys/integration/jenkins/scan/PluginParametersHandlerTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandlerTest.java index e467d870..d62d124e 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/PluginParametersHandlerTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandlerTest.java @@ -1,12 +1,12 @@ -package com.synopsys.integration.jenkins.scan; +package io.jenkins.plugins.synopsys.security.scan; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.exception.ScannerException; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.service.scan.ScanParametersService; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.exception.ScannerException; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.service.scan.ScanParametersService; import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadManagerTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManagerTest.java similarity index 98% rename from src/test/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadManagerTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManagerTest.java index 7bd3d210..cf5d1606 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadManagerTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManagerTest.java @@ -1,6 +1,6 @@ -package com.synopsys.integration.jenkins.scan.bridge; +package io.jenkins.plugins.synopsys.security.scan.bridge; -import com.synopsys.integration.jenkins.scan.global.Utility; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadTest.java similarity index 92% rename from src/test/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadTest.java index 1169e339..ec6285d0 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/bridge/BridgeDownloadTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadTest.java @@ -1,8 +1,8 @@ -package com.synopsys.integration.jenkins.scan.bridge; +package io.jenkins.plugins.synopsys.security.scan.bridge; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.Utility; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/bridge/BridgeInstallTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstallTest.java similarity index 98% rename from src/test/java/com/synopsys/integration/jenkins/scan/bridge/BridgeInstallTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstallTest.java index ab623e3d..6b3d9980 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/bridge/BridgeInstallTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstallTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.jenkins.scan.bridge; +package io.jenkins.plugins.synopsys.security.scan.bridge; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/factory/ScanParametersFactoryTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactoryTest.java similarity index 97% rename from src/test/java/com/synopsys/integration/jenkins/scan/factory/ScanParametersFactoryTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactoryTest.java index 414ab670..ae7876a7 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/factory/ScanParametersFactoryTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactoryTest.java @@ -1,8 +1,8 @@ -package com.synopsys.integration.jenkins.scan.factory; +package io.jenkins.plugins.synopsys.security.scan.factory; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.extension.pipeline.SecurityScanStep; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.extension.pipeline.SecurityScanStep; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import hudson.AbortException; import hudson.EnvVars; import hudson.FilePath; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/global/UtilityTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java similarity index 99% rename from src/test/java/com/synopsys/integration/jenkins/scan/global/UtilityTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java index f96de486..919ff593 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/global/UtilityTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.jenkins.scan.global; +package io.jenkins.plugins.synopsys.security.scan.global; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.when; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/service/ScannerArgumentServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentServiceTest.java similarity index 94% rename from src/test/java/com/synopsys/integration/jenkins/scan/service/ScannerArgumentServiceTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentServiceTest.java index c12aed6a..dadefc73 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/service/ScannerArgumentServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentServiceTest.java @@ -1,13 +1,13 @@ -package com.synopsys.integration.jenkins.scan.service; - -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.global.BridgeParams; -import com.synopsys.integration.jenkins.scan.global.Utility; -import com.synopsys.integration.jenkins.scan.input.BridgeInput; -import com.synopsys.integration.jenkins.scan.input.bitbucket.Bitbucket; -import com.synopsys.integration.jenkins.scan.input.blackduck.BlackDuck; -import com.synopsys.integration.jenkins.scan.input.coverity.Coverity; +package io.jenkins.plugins.synopsys.security.scan.service; + +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.BridgeParams; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; +import io.jenkins.plugins.synopsys.security.scan.input.BridgeInput; +import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Bitbucket; +import io.jenkins.plugins.synopsys.security.scan.input.blackduck.BlackDuck; +import io.jenkins.plugins.synopsys.security.scan.input.coverity.Coverity; import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/service/bridge/BridgeDownloadParameterServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParameterServiceTest.java similarity index 96% rename from src/test/java/com/synopsys/integration/jenkins/scan/service/bridge/BridgeDownloadParameterServiceTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParameterServiceTest.java index 63d0d873..b9354e75 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/service/bridge/BridgeDownloadParameterServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParameterServiceTest.java @@ -1,8 +1,8 @@ -package com.synopsys.integration.jenkins.scan.service.bridge; +package io.jenkins.plugins.synopsys.security.scan.service.bridge; import static org.junit.jupiter.api.Assertions.*; -import com.synopsys.integration.jenkins.scan.bridge.BridgeDownloadParameters; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.bridge.BridgeDownloadParameters; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import hudson.FilePath; import hudson.model.TaskListener; import java.io.File; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/service/diagnostics/DiagnosticsServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsServiceTest.java similarity index 95% rename from src/test/java/com/synopsys/integration/jenkins/scan/service/diagnostics/DiagnosticsServiceTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsServiceTest.java index b3545877..b35d759f 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/service/diagnostics/DiagnosticsServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsServiceTest.java @@ -1,9 +1,9 @@ -package com.synopsys.integration.jenkins.scan.service.diagnostics; +package io.jenkins.plugins.synopsys.security.scan.service.diagnostics; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.*; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import hudson.EnvVars; import hudson.FilePath; import hudson.Launcher; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/service/scan/ScanParametersServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersServiceTest.java similarity index 95% rename from src/test/java/com/synopsys/integration/jenkins/scan/service/scan/ScanParametersServiceTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersServiceTest.java index dd1689ed..f666bd26 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/service/scan/ScanParametersServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersServiceTest.java @@ -1,6 +1,6 @@ -package com.synopsys.integration.jenkins.scan.service.scan; +package io.jenkins.plugins.synopsys.security.scan.service.scan; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import hudson.model.TaskListener; import java.io.PrintStream; import java.util.HashMap; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java similarity index 94% rename from src/test/java/com/synopsys/integration/jenkins/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java index 249ecfd2..d168d670 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java @@ -1,8 +1,8 @@ -package com.synopsys.integration.jenkins.scan.service.scan.blackduck; +package io.jenkins.plugins.synopsys.security.scan.service.scan.blackduck; import static org.junit.jupiter.api.Assertions.*; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.input.blackduck.BlackDuck; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.input.blackduck.BlackDuck; import hudson.model.TaskListener; import java.io.PrintStream; import java.util.HashMap; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/service/scan/coverity/CoverityParametersServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersServiceTest.java similarity index 93% rename from src/test/java/com/synopsys/integration/jenkins/scan/service/scan/coverity/CoverityParametersServiceTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersServiceTest.java index 18090a0a..b0be4a67 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/service/scan/coverity/CoverityParametersServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersServiceTest.java @@ -1,10 +1,10 @@ -package com.synopsys.integration.jenkins.scan.service.scan.coverity; +package io.jenkins.plugins.synopsys.security.scan.service.scan.coverity; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.input.coverity.Coverity; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.input.coverity.Coverity; import hudson.model.TaskListener; import java.io.PrintStream; import java.util.HashMap; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/service/scan/polaris/PolarisParametersServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersServiceTest.java similarity index 94% rename from src/test/java/com/synopsys/integration/jenkins/scan/service/scan/polaris/PolarisParametersServiceTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersServiceTest.java index e82538ef..38124944 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/service/scan/polaris/PolarisParametersServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersServiceTest.java @@ -1,8 +1,8 @@ -package com.synopsys.integration.jenkins.scan.service.scan.polaris; +package io.jenkins.plugins.synopsys.security.scan.service.scan.polaris; import static org.junit.jupiter.api.Assertions.*; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.input.polaris.Polaris; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.input.polaris.Polaris; import hudson.model.TaskListener; import java.io.PrintStream; import java.util.Arrays; diff --git a/src/test/java/com/synopsys/integration/jenkins/scan/service/scm/BitbucketRepositoryServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryServiceTest.java similarity index 93% rename from src/test/java/com/synopsys/integration/jenkins/scan/service/scm/BitbucketRepositoryServiceTest.java rename to src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryServiceTest.java index 6521c529..a164678a 100644 --- a/src/test/java/com/synopsys/integration/jenkins/scan/service/scm/BitbucketRepositoryServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryServiceTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.jenkins.scan.service.scm; +package io.jenkins.plugins.synopsys.security.scan.service.scm; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyString; @@ -7,14 +7,14 @@ import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource; import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketApi; import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository; -import com.synopsys.integration.jenkins.scan.exception.PluginExceptionHandler; -import com.synopsys.integration.jenkins.scan.global.ApplicationConstants; -import com.synopsys.integration.jenkins.scan.input.bitbucket.*; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import java.io.IOException; import java.io.PrintStream; import java.util.HashMap; import java.util.Map; import hudson.model.TaskListener; +import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Bitbucket; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; From 61b02abb6714939982994ef0ef7351c7db23e48f Mon Sep 17 00:00:00 2001 From: jraihan <jahid.raihan@dsinnovators.com> Date: Mon, 16 Oct 2023 15:42:45 +0600 Subject: [PATCH 2/4] applied spotless --- pom.xml | 62 +++---- .../scan/PluginParametersHandler.java | 85 ++++++--- .../security/scan/SecurityScanner.java | 64 ++++--- .../security/scan/bridge/BridgeDownload.java | 25 +-- .../scan/bridge/BridgeDownloadManager.java | 53 +++--- .../scan/bridge/BridgeDownloadParameters.java | 2 +- .../security/scan/bridge/BridgeInstall.java | 11 +- .../extension/global/ScannerGlobalConfig.java | 4 + .../extension/pipeline/SecurityScanStep.java | 69 +++---- .../scan/factory/ScanParametersFactory.java | 174 ++++++++++++------ .../scan/global/ApplicationConstants.java | 2 +- .../security/scan/global/BridgeParams.java | 1 - .../scan/global/HomeDirectoryTask.java | 2 +- .../security/scan/global/LogMessages.java | 24 ++- .../security/scan/global/LoggerWrapper.java | 2 - .../security/scan/global/OsNameTask.java | 2 +- .../security/scan/global/Utility.java | 16 +- .../scan/input/blackduck/Automation.java | 2 +- .../security/scan/input/blackduck/Scan.java | 2 +- .../security/scan/input/coverity/Connect.java | 6 +- .../scan/input/coverity/Coverity.java | 4 + .../scan/input/polaris/ApplicationName.java | 1 + .../security/scan/input/polaris/Branch.java | 22 +-- .../scan/service/ScannerArgumentService.java | 61 ++++-- .../BridgeDownloadParametersService.java | 68 ++++--- .../diagnostics/DiagnosticsService.java | 14 +- .../service/scan/ScanParametersService.java | 3 +- .../blackduck/BlackDuckParametersService.java | 25 ++- .../coverity/CoverityParametersService.java | 27 +-- .../polaris/PolarisParametersService.java | 11 +- .../scm/BitbucketRepositoryService.java | 30 +-- .../service/scm/SCMRepositoryService.java | 18 +- .../scan/PluginParametersHandlerTest.java | 15 +- .../bridge/BridgeDownloadManagerTest.java | 53 ++++-- .../scan/bridge/BridgeDownloadTest.java | 37 ++-- .../scan/bridge/BridgeInstallTest.java | 17 +- .../factory/ScanParametersFactoryTest.java | 62 ++++--- .../security/scan/global/UtilityTest.java | 19 +- .../service/ScannerArgumentServiceTest.java | 100 ++++++---- .../BridgeDownloadParameterServiceTest.java | 42 +++-- .../diagnostics/DiagnosticsServiceTest.java | 23 ++- .../scan/ScanParametersServiceTest.java | 13 +- .../BlackDuckParametersServiceTest.java | 27 +-- .../CoverityParametersServiceTest.java | 13 +- .../polaris/PolarisParametersServiceTest.java | 12 +- .../scm/BitbucketRepositoryServiceTest.java | 44 +++-- 46 files changed, 824 insertions(+), 545 deletions(-) diff --git a/pom.xml b/pom.xml index 9044ea9e..a61921b5 100644 --- a/pom.xml +++ b/pom.xml @@ -14,9 +14,9 @@ <name>Synopsys Security Scan Plugin</name> <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url> <licenses> - <license> + <license> <name>Apache License</name> - <url> http://www.apache.org/licenses/</url> + <url>http://www.apache.org/licenses/</url> </license> </licenses> <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false"> @@ -47,32 +47,23 @@ </dependency> <dependency> <groupId>org.springframework.security</groupId> - <artifactId>spring-security-web</artifactId> + <artifactId>spring-security-core</artifactId> <version>5.8.5</version> </dependency> <dependency> <groupId>org.springframework.security</groupId> - <artifactId>spring-security-core</artifactId> + <artifactId>spring-security-crypto</artifactId> <version>5.8.5</version> </dependency> <dependency> <groupId>org.springframework.security</groupId> - <artifactId>spring-security-crypto</artifactId> + <artifactId>spring-security-web</artifactId> <version>5.8.5</version> </dependency> </dependencies> </dependencyManagement> <dependencies> - <dependency> - <groupId>org.jenkins-ci.plugins</groupId> - <artifactId>structs</artifactId> - </dependency> - <dependency> - <groupId>org.jenkins-ci.plugins.workflow</groupId> - <artifactId>workflow-step-api</artifactId> - <version>639.v6eca_cd8c04a_a_</version> - </dependency> <dependency> <groupId>org.jenkins-ci.plugins</groupId> <artifactId>cloudbees-bitbucket-branch-source</artifactId> @@ -84,6 +75,15 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.jenkins-ci.plugins</groupId> + <artifactId>structs</artifactId> + </dependency> + <dependency> + <groupId>org.jenkins-ci.plugins.workflow</groupId> + <artifactId>workflow-step-api</artifactId> + <version>639.v6eca_cd8c04a_a_</version> + </dependency> <dependency> <groupId>org.jenkins-ci.plugins.workflow</groupId> <artifactId>workflow-basic-steps</artifactId> @@ -124,6 +124,23 @@ </dependency> </dependencies> + <repositories> + <repository> + <id>repo.jenkins-ci.org</id> + <url>https://repo.jenkins-ci.org/public/</url> + </repository> + <repository> + <id>bds-artifactory</id> + <url>${repoReleaseArtifactoryUrl}</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>repo.jenkins-ci.org</id> + <url>https://repo.jenkins-ci.org/public/</url> + </pluginRepository> + </pluginRepositories> + <profiles> <profile> <id>snapshot-deployment</id> @@ -166,21 +183,4 @@ </distributionManagement> </profile> </profiles> - - <repositories> - <repository> - <id>repo.jenkins-ci.org</id> - <url>https://repo.jenkins-ci.org/public/</url> - </repository> - <repository> - <id>bds-artifactory</id> - <url>${repoReleaseArtifactoryUrl}</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>repo.jenkins-ci.org</id> - <url>https://repo.jenkins-ci.org/public/</url> - </pluginRepository> - </pluginRepositories> </project> diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java index df951dfa..07a34e80 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java @@ -7,6 +7,9 @@ */ package io.jenkins.plugins.synopsys.security.scan; +import hudson.EnvVars; +import hudson.FilePath; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.bridge.BridgeDownloadManager; import io.jenkins.plugins.synopsys.security.scan.bridge.BridgeDownloadParameters; import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; @@ -17,10 +20,6 @@ import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import io.jenkins.plugins.synopsys.security.scan.service.bridge.BridgeDownloadParametersService; import io.jenkins.plugins.synopsys.security.scan.service.scan.ScanParametersService; -import hudson.EnvVars; -import hudson.FilePath; -import hudson.model.TaskListener; - import java.util.Map; import java.util.Set; @@ -31,7 +30,8 @@ public class PluginParametersHandler { private final EnvVars envVars; private final LoggerWrapper logger; - public PluginParametersHandler(SecurityScanner scanner, FilePath workspace, EnvVars envVars, TaskListener listener) { + public PluginParametersHandler( + SecurityScanner scanner, FilePath workspace, EnvVars envVars, TaskListener listener) { this.scanner = scanner; this.workspace = workspace; this.listener = listener; @@ -42,17 +42,21 @@ public PluginParametersHandler(SecurityScanner scanner, FilePath workspace, EnvV public int initializeScanner(Map<String, Object> scanParameters) throws PluginExceptionHandler, ScannerException { ScanParametersService scanParametersService = new ScanParametersService(listener); BridgeDownloadParameters bridgeDownloadParameters = new BridgeDownloadParameters(workspace, listener); - BridgeDownloadParametersService bridgeDownloadParametersService = new BridgeDownloadParametersService(workspace, listener); - BridgeDownloadParameters bridgeDownloadParams = bridgeDownloadParametersService.getBridgeDownloadParams(scanParameters, bridgeDownloadParameters); + BridgeDownloadParametersService bridgeDownloadParametersService = + new BridgeDownloadParametersService(workspace, listener); + BridgeDownloadParameters bridgeDownloadParams = + bridgeDownloadParametersService.getBridgeDownloadParams(scanParameters, bridgeDownloadParameters); logMessagesForParameters(scanParameters, scanParametersService.getSynopsysSecurityProducts(scanParameters)); int exitCode = -1; - if (isValidScanParametersAndBridgeDownload(bridgeDownloadParams, scanParametersService, bridgeDownloadParametersService, scanParameters)) { + if (isValidScanParametersAndBridgeDownload( + bridgeDownloadParams, scanParametersService, bridgeDownloadParametersService, scanParameters)) { BridgeDownloadManager bridgeDownloadManager = new BridgeDownloadManager(workspace, listener, envVars); boolean isNetworkAirGap = checkNetworkAirgap(scanParameters); - boolean isBridgeInstalled = bridgeDownloadManager.checkIfBridgeInstalled(bridgeDownloadParams.getBridgeInstallationPath()); + boolean isBridgeInstalled = + bridgeDownloadManager.checkIfBridgeInstalled(bridgeDownloadParams.getBridgeInstallationPath()); boolean isBridgeDownloadRequired = true; handleNetworkAirgap(isNetworkAirGap, bridgeDownloadParams, isBridgeInstalled); @@ -61,9 +65,11 @@ public int initializeScanner(Map<String, Object> scanParameters) throws PluginEx isBridgeDownloadRequired = bridgeDownloadManager.isSynopsysBridgeDownloadRequired(bridgeDownloadParams); } - handleBridgeDownload(isBridgeDownloadRequired, isNetworkAirGap, bridgeDownloadParams, bridgeDownloadManager); + handleBridgeDownload( + isBridgeDownloadRequired, isNetworkAirGap, bridgeDownloadParams, bridgeDownloadManager); - FilePath bridgeInstallationPath = new FilePath(workspace.getChannel(), bridgeDownloadParams.getBridgeInstallationPath()); + FilePath bridgeInstallationPath = + new FilePath(workspace.getChannel(), bridgeDownloadParams.getBridgeInstallationPath()); exitCode = runScanner(scanParameters, bridgeInstallationPath); } @@ -72,20 +78,27 @@ public int initializeScanner(Map<String, Object> scanParameters) throws PluginEx return exitCode; } - private boolean isValidScanParametersAndBridgeDownload(BridgeDownloadParameters bridgeDownloadParams, ScanParametersService scanParametersService, BridgeDownloadParametersService bridgeDownloadParametersService,Map<String, Object> scanParameters) { - return scanParametersService.isValidScanParameters(scanParameters) && - bridgeDownloadParametersService.performBridgeDownloadParameterValidation(bridgeDownloadParams); + private boolean isValidScanParametersAndBridgeDownload( + BridgeDownloadParameters bridgeDownloadParams, + ScanParametersService scanParametersService, + BridgeDownloadParametersService bridgeDownloadParametersService, + Map<String, Object> scanParameters) { + return scanParametersService.isValidScanParameters(scanParameters) + && bridgeDownloadParametersService.performBridgeDownloadParameterValidation(bridgeDownloadParams); } private boolean checkNetworkAirgap(Map<String, Object> scanParameters) { - return scanParameters.containsKey(ApplicationConstants.NETWORK_AIRGAP_KEY) && - ((Boolean) scanParameters.get(ApplicationConstants.NETWORK_AIRGAP_KEY)).equals(true); + return scanParameters.containsKey(ApplicationConstants.NETWORK_AIRGAP_KEY) + && ((Boolean) scanParameters.get(ApplicationConstants.NETWORK_AIRGAP_KEY)).equals(true); } - private void handleNetworkAirgap(boolean isNetworkAirgap, BridgeDownloadParameters bridgeDownloadParams, boolean isBridgeInstalled) throws PluginExceptionHandler { + private void handleNetworkAirgap( + boolean isNetworkAirgap, BridgeDownloadParameters bridgeDownloadParams, boolean isBridgeInstalled) + throws PluginExceptionHandler { if (isNetworkAirgap && !bridgeDownloadParams.getBridgeDownloadUrl().contains(".zip") && !isBridgeInstalled) { logger.error("Synopsys Bridge could not be found in " + bridgeDownloadParams.getBridgeInstallationPath()); - throw new PluginExceptionHandler("Synopsys Bridge could not be found in " + bridgeDownloadParams.getBridgeInstallationPath()); + throw new PluginExceptionHandler( + "Synopsys Bridge could not be found in " + bridgeDownloadParams.getBridgeInstallationPath()); } if (isNetworkAirgap) { @@ -93,19 +106,28 @@ private void handleNetworkAirgap(boolean isNetworkAirgap, BridgeDownloadParamete } } - private void handleBridgeDownload(boolean isBridgeDownloadRequired, boolean isNetworkAirgap, BridgeDownloadParameters bridgeDownloadParams, BridgeDownloadManager bridgeDownloadManager) throws PluginExceptionHandler { - if (isBridgeDownloadRequired && bridgeDownloadParams.getBridgeDownloadUrl().contains(".zip")) { + private void handleBridgeDownload( + boolean isBridgeDownloadRequired, + boolean isNetworkAirgap, + BridgeDownloadParameters bridgeDownloadParams, + BridgeDownloadManager bridgeDownloadManager) + throws PluginExceptionHandler { + if (isBridgeDownloadRequired + && bridgeDownloadParams.getBridgeDownloadUrl().contains(".zip")) { if (isNetworkAirgap) { - logger.warn("Synopsys-Bridge will be downloaded from the provided custom URL. Make sure the network is reachable"); + logger.warn( + "Synopsys-Bridge will be downloaded from the provided custom URL. Make sure the network is reachable"); } bridgeDownloadManager.initiateBridgeDownloadAndUnzip(bridgeDownloadParams); } else { - logger.info("Bridge download is not required. Found installed in: " + bridgeDownloadParams.getBridgeInstallationPath()); + logger.info("Bridge download is not required. Found installed in: " + + bridgeDownloadParams.getBridgeInstallationPath()); logger.println(LogMessages.DASHES); } } - private int runScanner(Map<String, Object> scanParameters, FilePath bridgeInstallationPath) throws PluginExceptionHandler, ScannerException { + private int runScanner(Map<String, Object> scanParameters, FilePath bridgeInstallationPath) + throws PluginExceptionHandler, ScannerException { try { return scanner.runScanner(scanParameters, bridgeInstallationPath); } catch (PluginExceptionHandler e) { @@ -118,12 +140,12 @@ private int runScanner(Map<String, Object> scanParameters, FilePath bridgeInstal private void handleExitCode(int exitCode) throws PluginExceptionHandler { if (exitCode != 0) { Map<Integer, String> exitCodeToMessage = ExceptionMessages.bridgeErrorMessages(); - logger.error(exitCodeToMessage.getOrDefault(exitCode, ExceptionMessages.scannerFailedWithExitCode(exitCode))); + logger.error( + exitCodeToMessage.getOrDefault(exitCode, ExceptionMessages.scannerFailedWithExitCode(exitCode))); throw new PluginExceptionHandler("Workflow failed!"); } } - public void logMessagesForParameters(Map<String, Object> scanParameters, Set<String> securityProducts) { final String LOG_DASH = " --- "; @@ -137,9 +159,10 @@ public void logMessagesForParameters(Map<String, Object> scanParameters, Set<Str for (Map.Entry<String, Object> entry : scanParameters.entrySet()) { String key = entry.getKey(); - if(key.contains(securityProduct)) { + if (key.contains(securityProduct)) { Object value = entry.getValue(); - if(key.equals(ApplicationConstants.BLACKDUCK_TOKEN_KEY) || key.equals(ApplicationConstants.POLARIS_ACCESS_TOKEN_KEY) + if (key.equals(ApplicationConstants.BLACKDUCK_TOKEN_KEY) + || key.equals(ApplicationConstants.POLARIS_ACCESS_TOKEN_KEY) || key.equals(ApplicationConstants.COVERITY_PASSPHRASE_KEY)) { value = LogMessages.ASTERISKS; } @@ -154,11 +177,13 @@ public void logMessagesForParameters(Map<String, Object> scanParameters, Set<Str for (Map.Entry<String, Object> entry : scanParameters.entrySet()) { String key = entry.getKey(); - if(key.equals(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL) || key.equals(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION) - || key.equals(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY) || key.equals(ApplicationConstants.INCLUDE_DIAGNOSTICS_KEY)) { + if (key.equals(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL) + || key.equals(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION) + || key.equals(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY) + || key.equals(ApplicationConstants.INCLUDE_DIAGNOSTICS_KEY)) { Object value = entry.getValue(); logger.info(LOG_DASH + key + " = " + value.toString()); } } } -} \ No newline at end of file +} diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java index 8abe7f09..fd91021c 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java @@ -7,19 +7,18 @@ */ package io.jenkins.plugins.synopsys.security.scan; -import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; -import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; -import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; -import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; -import io.jenkins.plugins.synopsys.security.scan.service.ScannerArgumentService; -import io.jenkins.plugins.synopsys.security.scan.service.diagnostics.DiagnosticsService; import hudson.EnvVars; import hudson.FilePath; import hudson.Launcher; import hudson.model.Run; import hudson.model.TaskListener; import hudson.tasks.ArtifactArchiver; - +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; +import io.jenkins.plugins.synopsys.security.scan.service.ScannerArgumentService; +import io.jenkins.plugins.synopsys.security.scan.service.diagnostics.DiagnosticsService; import java.util.List; import java.util.Map; import java.util.Objects; @@ -34,8 +33,13 @@ public class SecurityScanner { private final EnvVars envVars; private final ScannerArgumentService scannerArgumentService; - public SecurityScanner(Run<?, ?> run, TaskListener listener, Launcher launcher, FilePath workspace, - EnvVars envVars, ScannerArgumentService scannerArgumentService) { + public SecurityScanner( + Run<?, ?> run, + TaskListener listener, + Launcher launcher, + FilePath workspace, + EnvVars envVars, + ScannerArgumentService scannerArgumentService) { this.run = run; this.listener = listener; this.launcher = launcher; @@ -45,40 +49,52 @@ public SecurityScanner(Run<?, ?> run, TaskListener listener, Launcher launcher, this.logger = new LoggerWrapper(listener); } - public int runScanner(Map<String, Object> scanParams, FilePath bridgeInstallationPath) throws PluginExceptionHandler { + public int runScanner(Map<String, Object> scanParams, FilePath bridgeInstallationPath) + throws PluginExceptionHandler { int scanner = -1; List<String> commandLineArgs = scannerArgumentService.getCommandLineArgs(scanParams, bridgeInstallationPath); - logger.info("Executable command line arguments: " + - commandLineArgs.stream().map(arg -> arg.concat(" ")).collect(Collectors.joining()).trim()); + logger.info("Executable command line arguments: " + + commandLineArgs.stream() + .map(arg -> arg.concat(" ")) + .collect(Collectors.joining()) + .trim()); try { logger.println(); - logger.println("******************************* %s *******************************", "START EXECUTION OF SYNOPSYS BRIDGE"); + logger.println( + "******************************* %s *******************************", + "START EXECUTION OF SYNOPSYS BRIDGE"); scanner = launcher.launch() - .cmds(commandLineArgs) - .envs(envVars) - .pwd(workspace) - .stdout(listener) - .quiet(true) - .join(); + .cmds(commandLineArgs) + .envs(envVars) + .pwd(workspace) + .stdout(listener) + .quiet(true) + .join(); } catch (Exception e) { logger.error(LogMessages.EXCEPTION_OCCURRED_WHILE_INVOKING_SYNOPSYS_BRIDGE, e.getMessage()); } finally { - logger.println("******************************* %s *******************************", "END EXECUTION OF SYNOPSYS BRIDGE"); + logger.println( + "******************************* %s *******************************", + "END EXECUTION OF SYNOPSYS BRIDGE"); scannerArgumentService.removeTemporaryInputJson(commandLineArgs); if (Objects.equals(scanParams.get(ApplicationConstants.INCLUDE_DIAGNOSTICS_KEY), true)) { - DiagnosticsService diagnosticsService = new DiagnosticsService(run, listener, launcher, envVars, - new ArtifactArchiver(ApplicationConstants.ALL_FILES_WILDCARD_SYMBOL)); - diagnosticsService.archiveDiagnostics(workspace.child(ApplicationConstants.BRIDGE_DIAGNOSTICS_DIRECTORY)); + DiagnosticsService diagnosticsService = new DiagnosticsService( + run, + listener, + launcher, + envVars, + new ArtifactArchiver(ApplicationConstants.ALL_FILES_WILDCARD_SYMBOL)); + diagnosticsService.archiveDiagnostics( + workspace.child(ApplicationConstants.BRIDGE_DIAGNOSTICS_DIRECTORY)); } } return scanner; } - } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java index 1f46c0e7..b4c25034 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java @@ -7,14 +7,14 @@ */ package io.jenkins.plugins.synopsys.security.scan.bridge; +import hudson.EnvVars; +import hudson.FilePath; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import io.jenkins.plugins.synopsys.security.scan.global.Utility; -import hudson.EnvVars; -import hudson.FilePath; -import hudson.model.TaskListener; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; @@ -59,7 +59,9 @@ public FilePath downloadSynopsysBridge(String bridgeDownloadUrl, String bridgeIn } if (!downloadSuccess) { - logger.error("Synopsys Bridge download failed after %s attempts", ApplicationConstants.BRIDGE_DOWNLOAD_MAX_RETRIES); + logger.error( + "Synopsys Bridge download failed after %s attempts", + ApplicationConstants.BRIDGE_DOWNLOAD_MAX_RETRIES); } if (bridgeZipFilePath == null) { @@ -85,7 +87,9 @@ private void handleDownloadException(Exception e, String bridgeDownloadUrl, int int statusCode = getHttpStatusCode(bridgeDownloadUrl); if (terminateRetry(statusCode)) { - logger.error("Synopsys Bridge download failed with status code: %s and plugin won't retry to download.", statusCode); + logger.error( + "Synopsys Bridge download failed with status code: %s and plugin won't retry to download.", + statusCode); throw e; } @@ -93,7 +97,6 @@ private void handleDownloadException(Exception e, String bridgeDownloadUrl, int logger.warn("Synopsys Bridge download failed and attempt#%s to download again.", retryCount); } - public int getHttpStatusCode(String url) { int statusCode = -1; @@ -112,11 +115,11 @@ public int getHttpStatusCode(String url) { } public boolean terminateRetry(int statusCode) { - return statusCode == HttpURLConnection.HTTP_UNAUTHORIZED || - statusCode == HttpURLConnection.HTTP_FORBIDDEN || - statusCode == HttpURLConnection.HTTP_OK || - statusCode == HttpURLConnection.HTTP_CREATED || - statusCode == 416; + return statusCode == HttpURLConnection.HTTP_UNAUTHORIZED + || statusCode == HttpURLConnection.HTTP_FORBIDDEN + || statusCode == HttpURLConnection.HTTP_OK + || statusCode == HttpURLConnection.HTTP_CREATED + || statusCode == 416; } public boolean checkIfBridgeUrlExists(String bridgeDownloadUrl) { diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java index 3e5cfe7d..e0cf9bd8 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java @@ -7,14 +7,14 @@ */ package io.jenkins.plugins.synopsys.security.scan.bridge; +import hudson.EnvVars; +import hudson.FilePath; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import io.jenkins.plugins.synopsys.security.scan.global.Utility; -import hudson.EnvVars; -import hudson.FilePath; -import hudson.model.TaskListener; import java.io.IOException; import java.net.*; import java.util.regex.Matcher; @@ -33,7 +33,8 @@ public BridgeDownloadManager(FilePath workspace, TaskListener listener, EnvVars this.envVars = envVars; } - public void initiateBridgeDownloadAndUnzip(BridgeDownloadParameters bridgeDownloadParams) throws PluginExceptionHandler { + public void initiateBridgeDownloadAndUnzip(BridgeDownloadParameters bridgeDownloadParams) + throws PluginExceptionHandler { BridgeDownload bridgeDownload = new BridgeDownload(workspace, listener, envVars); BridgeInstall bridgeInstall = new BridgeInstall(workspace, listener); @@ -44,9 +45,11 @@ public void initiateBridgeDownloadAndUnzip(BridgeDownloadParameters bridgeDownlo try { FilePath bridgeZipPath = bridgeDownload.downloadSynopsysBridge(bridgeDownloadUrl, bridgeInstallationPath); - bridgeInstall.installSynopsysBridge(bridgeZipPath, new FilePath(workspace.getChannel(), bridgeInstallationPath)); + bridgeInstall.installSynopsysBridge( + bridgeZipPath, new FilePath(workspace.getChannel(), bridgeInstallationPath)); } catch (Exception e) { - logger.error(LogMessages.EXCEPTION_OCCURRED_WHILE_DOWNLOADING_OR_INSTALLING_SYNOPSYS_BRIDGE, e.getMessage()); + logger.error( + LogMessages.EXCEPTION_OCCURRED_WHILE_DOWNLOADING_OR_INSTALLING_SYNOPSYS_BRIDGE, e.getMessage()); throw new PluginExceptionHandler(e.getMessage()); } } @@ -55,13 +58,14 @@ public boolean isSynopsysBridgeDownloadRequired(BridgeDownloadParameters bridgeD String bridgeDownloadUrl = bridgeDownloadParameters.getBridgeDownloadUrl(); String bridgeInstallationPath = bridgeDownloadParameters.getBridgeInstallationPath(); - String installedBridgeVersionFilePath; String os = Utility.getAgentOs(workspace, listener); if (os.contains("win")) { - installedBridgeVersionFilePath = String.join("\\", bridgeInstallationPath, ApplicationConstants.VERSION_FILE); + installedBridgeVersionFilePath = + String.join("\\", bridgeInstallationPath, ApplicationConstants.VERSION_FILE); } else { - installedBridgeVersionFilePath = String.join("/", bridgeInstallationPath, ApplicationConstants.VERSION_FILE); + installedBridgeVersionFilePath = + String.join("/", bridgeInstallationPath, ApplicationConstants.VERSION_FILE); } String installedBridgeVersion = getBridgeVersionFromVersionFile(installedBridgeVersionFilePath); @@ -77,10 +81,13 @@ public boolean checkIfBridgeInstalled(String synopsysBridgeInstallationPath) { if (installationDirectory.exists() && installationDirectory.isDirectory()) { FilePath extensionsDir = installationDirectory.child(ApplicationConstants.EXTENSIONS_DIRECTORY); FilePath bridgeBinaryFile = installationDirectory.child(ApplicationConstants.BRIDGE_BINARY); - FilePath bridgeBinaryFileWindows = installationDirectory.child(ApplicationConstants.BRIDGE_BINARY_WINDOWS); + FilePath bridgeBinaryFileWindows = + installationDirectory.child(ApplicationConstants.BRIDGE_BINARY_WINDOWS); FilePath versionFile = installationDirectory.child(ApplicationConstants.VERSION_FILE); - return extensionsDir.isDirectory() && (bridgeBinaryFile.exists() || bridgeBinaryFileWindows.exists()) && versionFile.exists(); + return extensionsDir.isDirectory() + && (bridgeBinaryFile.exists() || bridgeBinaryFileWindows.exists()) + && versionFile.exists(); } } catch (IOException | InterruptedException e) { logger.error("An exception occurred while checking if the bridge is installed: " + e.getMessage()); @@ -101,31 +108,29 @@ public String getBridgeVersionFromVersionFile(String versionFilePath) { } } } catch (IOException | InterruptedException e) { - logger.error("An exception occurred while extracting bridge-version from the 'versions.txt': " + e.getMessage()); + logger.error( + "An exception occurred while extracting bridge-version from the 'versions.txt': " + e.getMessage()); } return null; } public String getLatestBridgeVersionFromArtifactory(String bridgeDownloadUrl) { - if (Utility.isStringNullOrBlank(bridgeDownloadUrl)) - return ApplicationConstants.NOT_AVAILABLE; + if (Utility.isStringNullOrBlank(bridgeDownloadUrl)) return ApplicationConstants.NOT_AVAILABLE; String extractedVersionNumber = extractVersionFromUrl(bridgeDownloadUrl); - if(extractedVersionNumber.equals(ApplicationConstants.NOT_AVAILABLE)) { + if (extractedVersionNumber.equals(ApplicationConstants.NOT_AVAILABLE)) { String directoryUrl = getDirectoryUrl(bridgeDownloadUrl); - if(isVersionFileAvailableInArtifactory(directoryUrl)) { + if (isVersionFileAvailableInArtifactory(directoryUrl)) { String versionFilePath = downloadVersionFileFromArtifactory(directoryUrl); String latestVersion = getBridgeVersionFromVersionFile(versionFilePath); Utility.removeFile(versionFilePath, workspace, listener); return latestVersion; - } - else { + } else { return ApplicationConstants.NOT_AVAILABLE; } - } - else { + } else { return extractedVersionNumber; } } @@ -151,7 +156,7 @@ public String downloadVersionFileFromArtifactory(String directoryUrl) { public boolean isVersionFileAvailableInArtifactory(String directoryUrl) { try { - URL url = new URL(String.join("/",directoryUrl,ApplicationConstants.VERSION_FILE)); + URL url = new URL(String.join("/", directoryUrl, ApplicationConstants.VERSION_FILE)); HttpURLConnection connection = Utility.getHttpURLConnection(url, envVars, logger); if (connection != null) { @@ -159,7 +164,8 @@ public boolean isVersionFileAvailableInArtifactory(String directoryUrl) { return (connection.getResponseCode() >= 200 && connection.getResponseCode() < 300); } } catch (IOException e) { - logger.error("An exception occurred while checking if 'versions.txt' is available or not in the URL: " + e.getMessage()); + logger.error("An exception occurred while checking if 'versions.txt' is available or not in the URL: " + + e.getMessage()); } return false; } @@ -197,5 +203,4 @@ public String extractVersionFromUrl(String url) { return version; } - -} \ No newline at end of file +} diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java index 89f7a887..37634618 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java @@ -7,9 +7,9 @@ */ package io.jenkins.plugins.synopsys.security.scan.bridge; -import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import hudson.FilePath; import hudson.model.TaskListener; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; public class BridgeDownloadParameters { private String bridgeDownloadUrl; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java index 5bd9e007..78cf7648 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java @@ -7,15 +7,14 @@ */ package io.jenkins.plugins.synopsys.security.scan.bridge; +import hudson.FilePath; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.global.HomeDirectoryTask; import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import io.jenkins.plugins.synopsys.security.scan.global.Utility; -import hudson.FilePath; -import hudson.model.TaskListener; -import jenkins.model.Jenkins; - import java.io.IOException; +import jenkins.model.Jenkins; public class BridgeInstall { private final LoggerWrapper logger; @@ -31,7 +30,9 @@ public void installSynopsysBridge(FilePath bridgeZipPath, FilePath bridgeInstall if (bridgeZipPath != null && bridgeInstallationPath != null) { bridgeZipPath.unzip(bridgeInstallationPath); bridgeZipPath.delete(); - logger.info("Synopsys Bridge zip path: %s and bridge installation path: %s", bridgeZipPath.getRemote(), bridgeInstallationPath.getRemote()); + logger.info( + "Synopsys Bridge zip path: %s and bridge installation path: %s", + bridgeZipPath.getRemote(), bridgeInstallationPath.getRemote()); } } catch (Exception e) { logger.error("An exception occurred while unzipping Synopsys Bridge zip file: " + e.getMessage()); diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java index a84c6777..f23fbb39 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java @@ -21,12 +21,14 @@ public class ScannerGlobalConfig extends GlobalConfiguration implements Serializ @SuppressWarnings("lgtm[jenkins/plaintext-storage]") private String blackDuckApiToken; + private String blackDuckInstallationPath; private String coverityConnectUrl; private String coverityConnectUserName; @SuppressWarnings("lgtm[jenkins/plaintext-storage]") private String coverityConnectUserPassword; + private String coverityInstallationPath; private String synopsysBridgeDownloadUrlForMac; private String synopsysBridgeDownloadUrlForWindows; @@ -36,6 +38,7 @@ public class ScannerGlobalConfig extends GlobalConfiguration implements Serializ @SuppressWarnings("lgtm[jenkins/plaintext-storage]") private String bitbucketToken; + private String polarisServerUrl; @SuppressWarnings("lgtm[jenkins/plaintext-storage]") @@ -143,6 +146,7 @@ public String getBlackDuckUrl() { public String getBlackDuckApiToken() { return blackDuckApiToken; } + public String getBlackDuckInstallationPath() { return blackDuckInstallationPath; } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java index 48515fbd..5b2463c6 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java @@ -7,6 +7,12 @@ */ package io.jenkins.plugins.synopsys.security.scan.extension.pipeline; +import hudson.*; +import hudson.model.Node; +import hudson.model.Run; +import hudson.model.TaskListener; +import hudson.util.ListBoxModel; +import hudson.util.ListBoxModel.Option; import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; import io.jenkins.plugins.synopsys.security.scan.exception.ScannerException; import io.jenkins.plugins.synopsys.security.scan.factory.ScanParametersFactory; @@ -14,12 +20,6 @@ import io.jenkins.plugins.synopsys.security.scan.global.ExceptionMessages; import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import io.jenkins.plugins.synopsys.security.scan.global.enums.SecurityProduct; -import hudson.*; -import hudson.model.Node; -import hudson.model.Run; -import hudson.model.TaskListener; -import hudson.util.ListBoxModel; -import hudson.util.ListBoxModel.Option; import java.io.IOException; import java.io.Serializable; import java.util.*; @@ -42,7 +42,7 @@ public class SecurityScanStep extends Step implements Serializable { private String blackduck_install_directory; private Boolean blackduck_scan_full; private String blackduck_scan_failure_severities; -// private Boolean blackduck_automation_fixpr; + // private Boolean blackduck_automation_fixpr; private Boolean blackduck_automation_prcomment; private String blackduck_download_url; @@ -64,8 +64,7 @@ public class SecurityScanStep extends Step implements Serializable { private String polaris_assessment_types; private String polaris_triage; private String polaris_branch_name; -// private String polaris_branch_parent_name; - + // private String polaris_branch_parent_name; private transient String bitbucket_token; @@ -261,17 +260,17 @@ public void setCoverity_passphrase(String coverity_passphrase) { @DataBoundSetter public void setCoverity_project_name(String coverity_project_name) { - this.coverity_project_name = Util.fixEmptyAndTrim(coverity_project_name); + this.coverity_project_name = Util.fixEmptyAndTrim(coverity_project_name); } @DataBoundSetter public void setCoverity_stream_name(String coverity_stream_name) { - this.coverity_stream_name = Util.fixEmptyAndTrim(coverity_stream_name); + this.coverity_stream_name = Util.fixEmptyAndTrim(coverity_stream_name); } @DataBoundSetter public void setCoverity_policy_view(String coverity_policy_view) { - this.coverity_policy_view = Util.fixEmptyAndTrim(coverity_policy_view); + this.coverity_policy_view = Util.fixEmptyAndTrim(coverity_policy_view); } @DataBoundSetter @@ -281,17 +280,19 @@ public void setCoverity_install_directory(String coverity_install_directory) { @DataBoundSetter public void setCoverity_automation_prcomment(Boolean coverity_automation_prcomment) { - this.coverity_automation_prcomment = coverity_automation_prcomment ? true : null;; + this.coverity_automation_prcomment = coverity_automation_prcomment ? true : null; + ; } @DataBoundSetter public void setCoverity_version(String coverity_version) { - this.coverity_version = Util.fixEmptyAndTrim(coverity_version); + this.coverity_version = Util.fixEmptyAndTrim(coverity_version); } @DataBoundSetter public void setCoverity_local(Boolean coverity_local) { - this.coverity_local = coverity_local ? true : null;; + this.coverity_local = coverity_local ? true : null; + ; } @DataBoundSetter @@ -306,27 +307,27 @@ public void setPolaris_access_token(String polaris_access_token) { @DataBoundSetter public void setPolaris_application_name(String polaris_application_name) { - this.polaris_application_name = Util.fixEmptyAndTrim(polaris_application_name); + this.polaris_application_name = Util.fixEmptyAndTrim(polaris_application_name); } @DataBoundSetter public void setPolaris_project_name(String polaris_project_name) { - this.polaris_project_name = Util.fixEmptyAndTrim(polaris_project_name); + this.polaris_project_name = Util.fixEmptyAndTrim(polaris_project_name); } @DataBoundSetter public void setPolaris_assessment_types(String polaris_assessment_types) { - this.polaris_assessment_types = Util.fixEmptyAndTrim(polaris_assessment_types); + this.polaris_assessment_types = Util.fixEmptyAndTrim(polaris_assessment_types); } @DataBoundSetter public void setPolaris_triage(String polaris_triage) { - this.polaris_triage = Util.fixEmptyAndTrim(polaris_triage); + this.polaris_triage = Util.fixEmptyAndTrim(polaris_triage); } @DataBoundSetter public void setPolaris_branch_name(String polaris_branch_name) { - this.polaris_branch_name = Util.fixEmptyAndTrim(polaris_branch_name); + this.polaris_branch_name = Util.fixEmptyAndTrim(polaris_branch_name); } @DataBoundSetter @@ -351,17 +352,20 @@ public void setSynopsys_bridge_install_directory(String synopsys_bridge_install_ @DataBoundSetter public void setInclude_diagnostics(Boolean include_diagnostics) { - this.include_diagnostics = include_diagnostics ? true : null;; + this.include_diagnostics = include_diagnostics ? true : null; + ; } @DataBoundSetter public void setNetwork_airgap(Boolean network_airgap) { - this.network_airgap = network_airgap ? true : null;; + this.network_airgap = network_airgap ? true : null; + ; } - private Map<String, Object> getParametersMap(FilePath workspace, TaskListener listener) throws PluginExceptionHandler { - return ScanParametersFactory.preparePipelineParametersMap(this, - ScanParametersFactory.getGlobalConfigurationValues(workspace, listener), listener); + private Map<String, Object> getParametersMap(FilePath workspace, TaskListener listener) + throws PluginExceptionHandler { + return ScanParametersFactory.preparePipelineParametersMap( + this, ScanParametersFactory.getGlobalConfigurationValues(workspace, listener), listener); } @Override @@ -373,7 +377,8 @@ public StepExecution start(StepContext context) throws Exception { public static final class DescriptorImpl extends StepDescriptor { @Override public Set<? extends Class<?>> getRequiredContext() { - return new HashSet<>(Arrays.asList(Run.class, TaskListener.class, EnvVars.class, FilePath.class, Launcher.class, Node.class)); + return new HashSet<>(Arrays.asList( + Run.class, TaskListener.class, EnvVars.class, FilePath.class, Launcher.class, Node.class)); } @Override @@ -430,12 +435,13 @@ protected Integer run() throws PluginExceptionHandler, ScannerException { LoggerWrapper logger = new LoggerWrapper(listener); Integer result = null; - logger.println("**************************** START EXECUTION OF SYNOPSYS SECURITY SCAN ****************************"); + logger.println( + "**************************** START EXECUTION OF SYNOPSYS SECURITY SCAN ****************************"); try { - result = Integer.valueOf(ScanParametersFactory - .createPipelineCommand(run, listener, envVars, launcher, node, workspace) - .initializeScanner(getParametersMap(workspace, listener))); + result = Integer.valueOf( + ScanParametersFactory.createPipelineCommand(run, listener, envVars, launcher, node, workspace) + .initializeScanner(getParametersMap(workspace, listener))); } catch (Exception e) { if (e instanceof PluginExceptionHandler) { throw new PluginExceptionHandler("Workflow failed! " + e.getMessage()); @@ -443,7 +449,8 @@ protected Integer run() throws PluginExceptionHandler, ScannerException { throw new ScannerException(ExceptionMessages.scannerFailureMessage(e.getMessage())); } } finally { - logger.println("**************************** END EXECUTION OF SYNOPSYS SECURITY SCAN ****************************"); + logger.println( + "**************************** END EXECUTION OF SYNOPSYS SECURITY SCAN ****************************"); } return result; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java index 0169c53a..70403b8d 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java @@ -7,6 +7,13 @@ */ package io.jenkins.plugins.synopsys.security.scan.factory; +import hudson.AbortException; +import hudson.EnvVars; +import hudson.FilePath; +import hudson.Launcher; +import hudson.model.Node; +import hudson.model.Run; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.PluginParametersHandler; import io.jenkins.plugins.synopsys.security.scan.SecurityScanner; import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; @@ -15,17 +22,10 @@ import io.jenkins.plugins.synopsys.security.scan.global.*; import io.jenkins.plugins.synopsys.security.scan.global.enums.SecurityProduct; import io.jenkins.plugins.synopsys.security.scan.service.ScannerArgumentService; -import hudson.AbortException; -import hudson.EnvVars; -import hudson.FilePath; -import hudson.Launcher; -import hudson.model.Node; -import hudson.model.Run; -import hudson.model.TaskListener; -import jenkins.model.GlobalConfiguration; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import jenkins.model.GlobalConfiguration; public class ScanParametersFactory { private final EnvVars envVars; @@ -40,20 +40,30 @@ public ScanParametersFactory(EnvVars envVars, FilePath workspace) throws AbortEx this.workspace = workspace; } - public static PluginParametersHandler createPipelineCommand(Run<?, ?> run, TaskListener listener, - EnvVars envVars, Launcher launcher, - Node node, FilePath workspace) { + public static PluginParametersHandler createPipelineCommand( + Run<?, ?> run, TaskListener listener, EnvVars envVars, Launcher launcher, Node node, FilePath workspace) { return new PluginParametersHandler( - new SecurityScanner(run, listener, launcher, workspace, envVars, - new ScannerArgumentService(listener, envVars, workspace)), workspace, envVars, listener); + new SecurityScanner( + run, + listener, + launcher, + workspace, + envVars, + new ScannerArgumentService(listener, envVars, workspace)), + workspace, + envVars, + listener); } - public static Map<String, Object> preparePipelineParametersMap(SecurityScanStep scanStep, Map<String, Object> parametersMap, - TaskListener listener) throws PluginExceptionHandler { + public static Map<String, Object> preparePipelineParametersMap( + SecurityScanStep scanStep, Map<String, Object> parametersMap, TaskListener listener) + throws PluginExceptionHandler { String product = scanStep.getProduct(); - if(validateProduct(product, listener)) { - parametersMap.put(ApplicationConstants.PRODUCT_KEY, scanStep.getProduct().trim().toUpperCase()); + if (validateProduct(product, listener)) { + parametersMap.put( + ApplicationConstants.PRODUCT_KEY, + scanStep.getProduct().trim().toUpperCase()); parametersMap.putAll(prepareCoverityParametersMap(scanStep)); parametersMap.putAll(preparePolarisParametersMap(scanStep)); @@ -76,23 +86,48 @@ public static Map<String, Object> getGlobalConfigurationValues(FilePath workspac if (config != null) { - String synopsysBridgeDownloadUrl = getSynopsysBridgeDownloadUrlBasedOnAgentOS(workspace, listener, - config.getSynopsysBridgeDownloadUrlForMac(), config.getSynopsysBridgeDownloadUrlForLinux(), + String synopsysBridgeDownloadUrl = getSynopsysBridgeDownloadUrlBasedOnAgentOS( + workspace, + listener, + config.getSynopsysBridgeDownloadUrlForMac(), + config.getSynopsysBridgeDownloadUrlForLinux(), config.getSynopsysBridgeDownloadUrlForWindows()); addParameterIfNotBlank(globalParameters, ApplicationConstants.BLACKDUCK_URL_KEY, config.getBlackDuckUrl()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.BLACKDUCK_TOKEN_KEY, config.getBlackDuckApiToken()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.BLACKDUCK_INSTALL_DIRECTORY_KEY, config.getBlackDuckInstallationPath()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.COVERITY_URL_KEY, config.getCoverityConnectUrl()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.COVERITY_USER_KEY, config.getCoverityConnectUserName()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.COVERITY_PASSPHRASE_KEY, config.getCoverityConnectUserPassword()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.COVERITY_INSTALL_DIRECTORY_KEY, config.getCoverityInstallationPath()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.BITBUCKET_TOKEN_KEY, config.getBitbucketToken()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL, synopsysBridgeDownloadUrl); - addParameterIfNotBlank(globalParameters, ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY, config.getSynopsysBridgeInstallationPath()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION, config.getSynopsysBridgeVersion()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.POLARIS_SERVER_URL_KEY, config.getPolarisServerUrl()); - addParameterIfNotBlank(globalParameters, ApplicationConstants.POLARIS_ACCESS_TOKEN_KEY, config.getPolarisAccessToken()); + addParameterIfNotBlank( + globalParameters, ApplicationConstants.BLACKDUCK_TOKEN_KEY, config.getBlackDuckApiToken()); + addParameterIfNotBlank( + globalParameters, + ApplicationConstants.BLACKDUCK_INSTALL_DIRECTORY_KEY, + config.getBlackDuckInstallationPath()); + addParameterIfNotBlank( + globalParameters, ApplicationConstants.COVERITY_URL_KEY, config.getCoverityConnectUrl()); + addParameterIfNotBlank( + globalParameters, ApplicationConstants.COVERITY_USER_KEY, config.getCoverityConnectUserName()); + addParameterIfNotBlank( + globalParameters, + ApplicationConstants.COVERITY_PASSPHRASE_KEY, + config.getCoverityConnectUserPassword()); + addParameterIfNotBlank( + globalParameters, + ApplicationConstants.COVERITY_INSTALL_DIRECTORY_KEY, + config.getCoverityInstallationPath()); + addParameterIfNotBlank( + globalParameters, ApplicationConstants.BITBUCKET_TOKEN_KEY, config.getBitbucketToken()); + addParameterIfNotBlank( + globalParameters, ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL, synopsysBridgeDownloadUrl); + addParameterIfNotBlank( + globalParameters, + ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY, + config.getSynopsysBridgeInstallationPath()); + addParameterIfNotBlank( + globalParameters, + ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION, + config.getSynopsysBridgeVersion()); + addParameterIfNotBlank( + globalParameters, ApplicationConstants.POLARIS_SERVER_URL_KEY, config.getPolarisServerUrl()); + addParameterIfNotBlank( + globalParameters, ApplicationConstants.POLARIS_ACCESS_TOKEN_KEY, config.getPolarisAccessToken()); } return globalParameters; @@ -116,27 +151,34 @@ public static Map<String, Object> prepareBlackDuckParametersMap(SecurityScanStep } if (!Utility.isStringNullOrBlank(scanStep.getBlackduck_install_directory())) { - blackDuckParameters.put(ApplicationConstants.BLACKDUCK_INSTALL_DIRECTORY_KEY, scanStep.getBlackduck_install_directory()); + blackDuckParameters.put( + ApplicationConstants.BLACKDUCK_INSTALL_DIRECTORY_KEY, scanStep.getBlackduck_install_directory()); } if (!Utility.isStringNullOrBlank(scanStep.getBlackduck_scan_failure_severities())) { - blackDuckParameters.put(ApplicationConstants.BLACKDUCK_SCAN_FAILURE_SEVERITIES_KEY, scanStep.getBlackduck_scan_failure_severities().toUpperCase()); + blackDuckParameters.put( + ApplicationConstants.BLACKDUCK_SCAN_FAILURE_SEVERITIES_KEY, + scanStep.getBlackduck_scan_failure_severities().toUpperCase()); } if (scanStep.isBlackduck_scan_full() != null) { blackDuckParameters.put(ApplicationConstants.BLACKDUCK_SCAN_FULL_KEY, scanStep.isBlackduck_scan_full()); } -// if (scanStep.isBlackduck_automation_fixpr() != null) { -// blackDuckParameters.put(ApplicationConstants.BLACKDUCK_AUTOMATION_FIXPR_KEY, scanStep.isBlackduck_automation_fixpr()); -// } + // if (scanStep.isBlackduck_automation_fixpr() != null) { + // blackDuckParameters.put(ApplicationConstants.BLACKDUCK_AUTOMATION_FIXPR_KEY, + // scanStep.isBlackduck_automation_fixpr()); + // } if (scanStep.isBlackduck_automation_prcomment() != null) { - blackDuckParameters.put(ApplicationConstants.BLACKDUCK_AUTOMATION_PRCOMMENT_KEY, scanStep.isBlackduck_automation_prcomment()); + blackDuckParameters.put( + ApplicationConstants.BLACKDUCK_AUTOMATION_PRCOMMENT_KEY, + scanStep.isBlackduck_automation_prcomment()); } if (!Utility.isStringNullOrBlank(scanStep.getBlackduck_download_url())) { - blackDuckParameters.put(ApplicationConstants.BLACKDUCK_DOWNLOAD_URL_KEY, scanStep.getBlackduck_download_url()); + blackDuckParameters.put( + ApplicationConstants.BLACKDUCK_DOWNLOAD_URL_KEY, scanStep.getBlackduck_download_url()); } return blackDuckParameters; @@ -170,7 +212,8 @@ public static Map<String, Object> prepareCoverityParametersMap(SecurityScanStep } if (!Utility.isStringNullOrBlank(scanStep.getCoverity_install_directory())) { - coverityParameters.put(ApplicationConstants.COVERITY_INSTALL_DIRECTORY_KEY,scanStep.getCoverity_install_directory()); + coverityParameters.put( + ApplicationConstants.COVERITY_INSTALL_DIRECTORY_KEY, scanStep.getCoverity_install_directory()); } if (!Utility.isStringNullOrBlank(scanStep.getCoverity_version())) { @@ -182,7 +225,8 @@ public static Map<String, Object> prepareCoverityParametersMap(SecurityScanStep } if (scanStep.isCoverity_automation_prcomment() != null) { - coverityParameters.put(ApplicationConstants.COVERITY_AUTOMATION_PRCOMMENT_KEY, scanStep.isCoverity_automation_prcomment()); + coverityParameters.put( + ApplicationConstants.COVERITY_AUTOMATION_PRCOMMENT_KEY, scanStep.isCoverity_automation_prcomment()); } return coverityParameters; @@ -192,18 +236,23 @@ public static Map<String, Object> prepareBridgeParametersMap(SecurityScanStep sc Map<String, Object> bridgeParameters = new HashMap<>(); if (!Utility.isStringNullOrBlank(scanStep.getSynopsys_bridge_download_url())) { - bridgeParameters.put(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL, scanStep.getSynopsys_bridge_download_url()); + bridgeParameters.put( + ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL, scanStep.getSynopsys_bridge_download_url()); } if (!Utility.isStringNullOrBlank(scanStep.getSynopsys_bridge_download_version())) { - bridgeParameters.put(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION, scanStep.getSynopsys_bridge_download_version()); + bridgeParameters.put( + ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION, + scanStep.getSynopsys_bridge_download_version()); } if (!Utility.isStringNullOrBlank(scanStep.getSynopsys_bridge_install_directory())) { - bridgeParameters.put(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY, scanStep.getSynopsys_bridge_install_directory()); + bridgeParameters.put( + ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY, + scanStep.getSynopsys_bridge_install_directory()); } - if(scanStep.isInclude_diagnostics() != null) { + if (scanStep.isInclude_diagnostics() != null) { bridgeParameters.put(ApplicationConstants.INCLUDE_DIAGNOSTICS_KEY, scanStep.isInclude_diagnostics()); } @@ -226,7 +275,8 @@ public static Map<String, Object> preparePolarisParametersMap(SecurityScanStep s } if (!Utility.isStringNullOrBlank(scanStep.getPolaris_application_name())) { - polarisParametersMap.put(ApplicationConstants.POLARIS_APPLICATION_NAME_KEY, scanStep.getPolaris_application_name()); + polarisParametersMap.put( + ApplicationConstants.POLARIS_APPLICATION_NAME_KEY, scanStep.getPolaris_application_name()); } if (!Utility.isStringNullOrBlank(scanStep.getPolaris_project_name())) { @@ -234,7 +284,8 @@ public static Map<String, Object> preparePolarisParametersMap(SecurityScanStep s } if (!Utility.isStringNullOrBlank(scanStep.getPolaris_assessment_types())) { - polarisParametersMap.put(ApplicationConstants.POLARIS_ASSESSMENT_TYPES_KEY, scanStep.getPolaris_assessment_types()); + polarisParametersMap.put( + ApplicationConstants.POLARIS_ASSESSMENT_TYPES_KEY, scanStep.getPolaris_assessment_types()); } if (!Utility.isStringNullOrBlank(scanStep.getPolaris_triage())) { @@ -245,17 +296,20 @@ public static Map<String, Object> preparePolarisParametersMap(SecurityScanStep s polarisParametersMap.put(ApplicationConstants.POLARIS_BRANCH_NAME_KEY, scanStep.getPolaris_branch_name()); } -// if (!Utility.isStringNullOrBlank(scanStep.getBridge_polaris_branch_parent_name())) { -// polarisParametersMap.put(ApplicationConstants.POLARIS_BRANCH_PARENT_NAME_KEY, scanStep.getBridge_polaris_branch_parent_name()); -// } + // if (!Utility.isStringNullOrBlank(scanStep.getBridge_polaris_branch_parent_name())) { + // polarisParametersMap.put(ApplicationConstants.POLARIS_BRANCH_PARENT_NAME_KEY, + // scanStep.getBridge_polaris_branch_parent_name()); + // } return polarisParametersMap; } - public static String getSynopsysBridgeDownloadUrlBasedOnAgentOS(FilePath workspace, TaskListener listener, - String synopsysBridgeDownloadUrlForMac, - String synopsysBridgeDownloadUrlForLinux, - String synopsysBridgeDownloadUrlForWindows) { + public static String getSynopsysBridgeDownloadUrlBasedOnAgentOS( + FilePath workspace, + TaskListener listener, + String synopsysBridgeDownloadUrlForMac, + String synopsysBridgeDownloadUrlForLinux, + String synopsysBridgeDownloadUrlForWindows) { String agentOs = Utility.getAgentOs(workspace, listener); if (agentOs.contains("mac")) { return synopsysBridgeDownloadUrlForMac; @@ -269,19 +323,17 @@ public static String getSynopsysBridgeDownloadUrlBasedOnAgentOS(FilePath workspa public static boolean validateProduct(String product, TaskListener listener) { LoggerWrapper logger = new LoggerWrapper(listener); - boolean isValid = !Utility.isStringNullOrBlank(product) && - Arrays.stream(product.split(",")) + boolean isValid = !Utility.isStringNullOrBlank(product) + && Arrays.stream(product.split(",")) .map(String::trim) .map(String::toUpperCase) - .allMatch(p -> p.equals(SecurityProduct.BLACKDUCK.name()) || - p.equals(SecurityProduct.POLARIS.name()) || - p.equals(SecurityProduct.COVERITY.name())); - + .allMatch(p -> p.equals(SecurityProduct.BLACKDUCK.name()) + || p.equals(SecurityProduct.POLARIS.name()) + || p.equals(SecurityProduct.COVERITY.name())); if (!isValid) { logger.error(LogMessages.INVALID_SYNOPSYS_SECURITY_PRODUCT); - logger.info("Supported Synopsys Security Products: " + - Arrays.toString(SecurityProduct.values())); + logger.info("Supported Synopsys Security Products: " + Arrays.toString(SecurityProduct.values())); } return isValid; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java index 32120005..84d5a655 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java @@ -81,4 +81,4 @@ public class ApplicationConstants { public static final String HTTPS_PROXY = "HTTPS_PROXY"; public static final String HTTP_PROXY = "HTTP_PROXY"; public static final String NO_PROXY = "NO_PROXY"; -} \ No newline at end of file +} diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java index 74a4754f..b746bba0 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java @@ -15,5 +15,4 @@ public class BridgeParams { public static final String BLACKDUCK_STAGE = "blackduck"; public static final String POLARIS_STAGE = "polaris"; public static final String COVERITY_STAGE = "connect"; - } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java index ddeb71ae..8f67d6ae 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java @@ -22,4 +22,4 @@ public HomeDirectoryTask(String separator) { public String invoke(File f, VirtualChannel channel) { return System.getProperty("user.home").concat(separator).concat(ApplicationConstants.DEFAULT_DIRECTORY_NAME); } -} \ No newline at end of file +} diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java index 77a40fdf..f0574334 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java @@ -8,20 +8,28 @@ package io.jenkins.plugins.synopsys.security.scan.global; public class LogMessages { - public static final String ASTERISKS = "******************************************************************************"; - public static final String DASHES = "------------------------------------------------------------------------------------"; + public static final String ASTERISKS = + "******************************************************************************"; + public static final String DASHES = + "------------------------------------------------------------------------------------"; public static final String INVALID_SYNOPSYS_BRIDGE_DOWNLOAD_URL = "Invalid Synopsys Bridge download URL: %s"; - public static final String FAILED_TO_FETCH_PLUGINS_DEFAULT_INSTALLATION_PATH = "Failed to fetch plugin's default installation path: %s"; + public static final String FAILED_TO_FETCH_PLUGINS_DEFAULT_INSTALLATION_PATH = + "Failed to fetch plugin's default installation path: %s"; public static final String BLACKDUCK_PARAMETER_VALIDATION_FAILED = "BlackDuck parameters are not valid"; public static final String COVERITY_PARAMETER_VALIDATION_FAILED = "Coverity parameters are not valid"; public static final String POLARIS_PARAMETER_VALIDATION_FAILED = "Polaris parameters are not valid"; - public static final String NO_BITBUCKET_TOKEN_FOUND = "PrComment or FixPr is set true but no bitbucket token found!"; + public static final String NO_BITBUCKET_TOKEN_FOUND = + "PrComment or FixPr is set true but no bitbucket token found!"; public static final String INVALID_BRIDGE_DOWNLOAD_PARAMETERS = "Bridge download parameters are not valid"; public static final String EMPTY_BRIDGE_DOWNLOAD_URL_PROVIDED = "The provided Bridge download URL is empty"; - public static final String INVALID_BRIDGE_DOWNLOAD_URL_PROVIDED = "The provided Bridge download URL is not valid: %s"; - public static final String INVALID_BRIDGE_DOWNLOAD_VERSION_PROVIDED = "The provided Bridge download version is not valid: %s"; - public static final String EXCEPTION_OCCURRED_WHILE_INVOKING_SYNOPSYS_BRIDGE = "An exception occurred while invoking synopsys-bridge from the plugin: %s"; - public static final String EXCEPTION_OCCURRED_WHILE_DOWNLOADING_OR_INSTALLING_SYNOPSYS_BRIDGE = "An exception occurred while installing/downloading synopsys-bridge: %s"; + public static final String INVALID_BRIDGE_DOWNLOAD_URL_PROVIDED = + "The provided Bridge download URL is not valid: %s"; + public static final String INVALID_BRIDGE_DOWNLOAD_VERSION_PROVIDED = + "The provided Bridge download version is not valid: %s"; + public static final String EXCEPTION_OCCURRED_WHILE_INVOKING_SYNOPSYS_BRIDGE = + "An exception occurred while invoking synopsys-bridge from the plugin: %s"; + public static final String EXCEPTION_OCCURRED_WHILE_DOWNLOADING_OR_INSTALLING_SYNOPSYS_BRIDGE = + "An exception occurred while installing/downloading synopsys-bridge: %s"; public static final String INVALID_SYNOPSYS_SECURITY_PRODUCT = "Invalid Synopsys Security Product!"; public static final String SYNOPSYS_BRIDGE_DOWNLOAD_FAILED = "Synopsys bridge download failed!"; } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java index a8a157d4..eca259ca 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java @@ -43,6 +43,4 @@ public void println(String format, Object... args) { public void println() { listener.getLogger().println(); } - } - diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java index 468f0f5d..77195f08 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java @@ -17,4 +17,4 @@ public class OsNameTask extends MasterToSlaveFileCallable<String> implements Fil public String invoke(File workspace, VirtualChannel channel) { return System.getProperty("os.name").toLowerCase(); } -} \ No newline at end of file +} diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java index 912585bf..de92b371 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java @@ -26,20 +26,21 @@ public static String getDirectorySeparator(FilePath workspace, TaskListener list if (os != null && os.contains("win")) { return "\\"; - } else { + } else { return "/"; } } public static String getAgentOs(FilePath workspace, TaskListener listener) { - String os = null; + String os = null; LoggerWrapper logger = new LoggerWrapper(listener); if (workspace.isRemote()) { try { os = workspace.act(new OsNameTask()); } catch (IOException | InterruptedException e) { - logger.error("An exception occurred while fetching the OS information for the agent node: " + e.getMessage()); + logger.error("An exception occurred while fetching the OS information for the agent node: " + + e.getMessage()); } } else { os = System.getProperty("os.name").toLowerCase(); @@ -48,7 +49,6 @@ public static String getAgentOs(FilePath workspace, TaskListener listener) { return os; } - public static void removeFile(String filePath, FilePath workspace, TaskListener listener) { LoggerWrapper logger = new LoggerWrapper(listener); try { @@ -76,7 +76,7 @@ public static HttpURLConnection getHttpURLConnection(URL url, EnvVars envVars, L URL proxyURL = new URL(proxy); HttpURLConnection connection = (HttpURLConnection) url.openConnection( - new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyURL.getHost(), proxyURL.getPort()))); + new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyURL.getHost(), proxyURL.getPort()))); setDefaultProxyAuthenticator(proxyURL.getUserInfo()); return connection; @@ -99,12 +99,11 @@ public static String getProxy(URL url, EnvVars envVars, LoggerWrapper logger) th return ApplicationConstants.NO_PROXY; } else if (noProxyHost.startsWith("*") && noProxyHost.length() > 2) { noProxyHost = noProxyHost.substring(2); - if(url.toString().contains(noProxyHost)){ + if (url.toString().contains(noProxyHost)) { return ApplicationConstants.NO_PROXY; } } } - } return getProxyValue(envVars, logger); @@ -123,7 +122,7 @@ public static String getProxyValue(EnvVars envVars, LoggerWrapper logger) throws return httpProxy; } - return ApplicationConstants.NO_PROXY; + return ApplicationConstants.NO_PROXY; } public static String getEnvOrSystemProxyDetails(String proxyType, EnvVars envVars) { @@ -164,5 +163,4 @@ private static String getMaskedProxyUrl(String proxyUrlString) throws MalformedU return proxyUrlString; } - } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java index a0ceb1eb..22cbc2bb 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java @@ -12,6 +12,7 @@ public class Automation { @JsonProperty("fixpr") private Boolean fixpr; + @JsonProperty("prComment") private Boolean prComment; @@ -31,4 +32,3 @@ public void setPrComment(Boolean prComment) { this.prComment = prComment; } } - diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java index a0352324..8c0c1c90 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java @@ -12,6 +12,7 @@ public class Scan { @JsonProperty("full") private Boolean full; + @JsonProperty("failure") private Failure failure; @@ -34,5 +35,4 @@ public Failure getFailure() { public void setFailure(Failure failure) { this.failure = failure; } - } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java index 32d827c6..d06d56b2 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java @@ -7,21 +7,23 @@ */ package io.jenkins.plugins.synopsys.security.scan.input.coverity; - import com.fasterxml.jackson.annotation.JsonProperty; public class Connect { @JsonProperty("url") private String url; + @JsonProperty("user") private User user; + @JsonProperty("project") private Project project; + @JsonProperty("stream") private Stream stream; + @JsonProperty("policy") private Policy policy; - Connect() { user = new User(); diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java index afd87463..359722f2 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java @@ -13,12 +13,16 @@ public class Coverity { @JsonProperty("connect") private Connect connect; + @JsonProperty("install") private Install install; + @JsonProperty("automation") private Automation automation; + @JsonProperty("version") private String version; + @JsonProperty("local") private boolean local; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java index e74d6a56..7d7aa891 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java @@ -6,6 +6,7 @@ * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package io.jenkins.plugins.synopsys.security.scan.input.polaris; + import com.fasterxml.jackson.annotation.JsonProperty; public class ApplicationName { diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java index 81616307..ab7739d4 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java @@ -13,12 +13,12 @@ public class Branch { @JsonProperty("name") private String name; -// @JsonProperty("parent") -// private Parent parent; + // @JsonProperty("parent") + // private Parent parent; -// public Branch() { -// parent = new Parent(); -// } + // public Branch() { + // parent = new Parent(); + // } public String getName() { return name; @@ -28,11 +28,11 @@ public void setName(String name) { this.name = name; } -// public Parent getParent() { -// return parent; -// } + // public Parent getParent() { + // return parent; + // } -// public void setParent(Parent parent) { -// this.parent = parent; -// } + // public void setParent(Parent parent) { + // this.parent = parent; + // } } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java index 8a9fbe12..18e13a8e 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java @@ -9,6 +9,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; +import hudson.EnvVars; +import hudson.FilePath; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.global.BridgeParams; @@ -26,10 +29,6 @@ import io.jenkins.plugins.synopsys.security.scan.service.scan.coverity.CoverityParametersService; import io.jenkins.plugins.synopsys.security.scan.service.scan.polaris.PolarisParametersService; import io.jenkins.plugins.synopsys.security.scan.service.scm.SCMRepositoryService; -import hudson.EnvVars; -import hudson.FilePath; -import hudson.model.TaskListener; - import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; @@ -52,7 +51,8 @@ public ScannerArgumentService(TaskListener listener, EnvVars envVars, FilePath w this.logger = new LoggerWrapper(listener); } - public List<String> getCommandLineArgs(Map<String, Object> scanParameters, FilePath bridgeInstallationPath) throws PluginExceptionHandler { + public List<String> getCommandLineArgs(Map<String, Object> scanParameters, FilePath bridgeInstallationPath) + throws PluginExceptionHandler { List<String> commandLineArgs = new ArrayList<>(); commandLineArgs.add(getBridgeRunCommand(bridgeInstallationPath)); @@ -70,13 +70,18 @@ private String getBridgeRunCommand(FilePath bridgeInstallationPath) { String os = Utility.getAgentOs(workspace, listener); if (os.contains("win")) { - return bridgeInstallationPath.child(ApplicationConstants.SYNOPSYS_BRIDGE_RUN_COMMAND_WINDOWS).getRemote(); + return bridgeInstallationPath + .child(ApplicationConstants.SYNOPSYS_BRIDGE_RUN_COMMAND_WINDOWS) + .getRemote(); } else { - return bridgeInstallationPath.child(ApplicationConstants.SYNOPSYS_BRIDGE_RUN_COMMAND).getRemote(); + return bridgeInstallationPath + .child(ApplicationConstants.SYNOPSYS_BRIDGE_RUN_COMMAND) + .getRemote(); } } - private List<String> getSecurityProductSpecificCommands(Map<String, Object> scanParameters) throws PluginExceptionHandler { + private List<String> getSecurityProductSpecificCommands(Map<String, Object> scanParameters) + throws PluginExceptionHandler { ScanParametersService scanParametersService = new ScanParametersService(listener); Set<String> securityProducts = scanParametersService.getSynopsysSecurityProducts(scanParameters); @@ -101,7 +106,12 @@ private List<String> getSecurityProductSpecificCommands(Map<String, Object> scan scanCommands.add(BridgeParams.STAGE_OPTION); scanCommands.add(BridgeParams.BLACKDUCK_STAGE); scanCommands.add(BridgeParams.INPUT_OPTION); - scanCommands.add(createBridgeInputJson(blackDuck, scmObject, fixPrOrPrComment, networkAirGap, ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX)); + scanCommands.add(createBridgeInputJson( + blackDuck, + scmObject, + fixPrOrPrComment, + networkAirGap, + ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX)); } if (securityProducts.contains(SecurityProduct.COVERITY.name())) { CoverityParametersService coverityParametersService = new CoverityParametersService(listener); @@ -110,7 +120,12 @@ private List<String> getSecurityProductSpecificCommands(Map<String, Object> scan scanCommands.add(BridgeParams.STAGE_OPTION); scanCommands.add(BridgeParams.COVERITY_STAGE); scanCommands.add(BridgeParams.INPUT_OPTION); - scanCommands.add(createBridgeInputJson(coverity, scmObject, fixPrOrPrComment, networkAirGap, ApplicationConstants.COVERITY_INPUT_JSON_PREFIX)); + scanCommands.add(createBridgeInputJson( + coverity, + scmObject, + fixPrOrPrComment, + networkAirGap, + ApplicationConstants.COVERITY_INPUT_JSON_PREFIX)); } if (securityProducts.contains(SecurityProduct.POLARIS.name())) { PolarisParametersService polarisParametersService = new PolarisParametersService(listener); @@ -119,13 +134,23 @@ private List<String> getSecurityProductSpecificCommands(Map<String, Object> scan scanCommands.add(BridgeParams.STAGE_OPTION); scanCommands.add(BridgeParams.POLARIS_STAGE); scanCommands.add(BridgeParams.INPUT_OPTION); - scanCommands.add(createBridgeInputJson(polaris, scmObject, fixPrOrPrComment, networkAirGap, ApplicationConstants.POLARIS_INPUT_JSON_PREFIX)); + scanCommands.add(createBridgeInputJson( + polaris, + scmObject, + fixPrOrPrComment, + networkAirGap, + ApplicationConstants.POLARIS_INPUT_JSON_PREFIX)); } return scanCommands; } - public String createBridgeInputJson(Object scanObject, Object scmObject, boolean fixPrOrPrComment, NetworkAirGap networkAirGap, String jsonPrefix) { + public String createBridgeInputJson( + Object scanObject, + Object scmObject, + boolean fixPrOrPrComment, + NetworkAirGap networkAirGap, + String jsonPrefix) { BridgeInput bridgeInput = new BridgeInput(); setScanObject(bridgeInput, scanObject, scmObject); @@ -213,14 +238,14 @@ public String writeInputJsonToFile(String inputJson, String jsonPrefix) { } public boolean isFixPrOrPrCommentValueSet(Map<String, Object> scanParameters) { - if (scanParameters.containsKey(ApplicationConstants.BLACKDUCK_AUTOMATION_FIXPR_KEY) && - Objects.equals(scanParameters.get(ApplicationConstants.BLACKDUCK_AUTOMATION_FIXPR_KEY), true)) { + if (scanParameters.containsKey(ApplicationConstants.BLACKDUCK_AUTOMATION_FIXPR_KEY) + && Objects.equals(scanParameters.get(ApplicationConstants.BLACKDUCK_AUTOMATION_FIXPR_KEY), true)) { return true; - } else if (scanParameters.containsKey(ApplicationConstants.BLACKDUCK_AUTOMATION_PRCOMMENT_KEY) && - Objects.equals(scanParameters.get(ApplicationConstants.BLACKDUCK_AUTOMATION_PRCOMMENT_KEY), true)) { + } else if (scanParameters.containsKey(ApplicationConstants.BLACKDUCK_AUTOMATION_PRCOMMENT_KEY) + && Objects.equals(scanParameters.get(ApplicationConstants.BLACKDUCK_AUTOMATION_PRCOMMENT_KEY), true)) { return true; - } else if (scanParameters.containsKey(ApplicationConstants.COVERITY_AUTOMATION_PRCOMMENT_KEY) && - Objects.equals(scanParameters.get(ApplicationConstants.COVERITY_AUTOMATION_PRCOMMENT_KEY), true)) { + } else if (scanParameters.containsKey(ApplicationConstants.COVERITY_AUTOMATION_PRCOMMENT_KEY) + && Objects.equals(scanParameters.get(ApplicationConstants.COVERITY_AUTOMATION_PRCOMMENT_KEY), true)) { return true; } return false; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java index 6a5ab763..f576ce02 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java @@ -7,13 +7,13 @@ */ package io.jenkins.plugins.synopsys.security.scan.service.bridge; +import hudson.FilePath; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.bridge.BridgeDownloadParameters; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import io.jenkins.plugins.synopsys.security.scan.global.Utility; -import hudson.FilePath; -import hudson.model.TaskListener; import java.io.IOException; import java.net.URL; import java.util.Map; @@ -36,7 +36,7 @@ public boolean performBridgeDownloadParameterValidation(BridgeDownloadParameters boolean validVersion = isValidVersion(bridgeDownloadParameters.getBridgeDownloadVersion()); boolean validInstallationPath = isValidInstallationPath(bridgeDownloadParameters.getBridgeInstallationPath()); - if(validUrl && validVersion && validInstallationPath) { + if (validUrl && validVersion && validInstallationPath) { logger.info("Bridge download parameters are validated successfully"); return true; } else { @@ -63,7 +63,7 @@ public boolean isValidUrl(String url) { public boolean isValidVersion(String version) { Pattern pattern = Pattern.compile("\\d+\\.\\d+\\.\\d+"); Matcher matcher = pattern.matcher(version); - if( matcher.matches() || version.equals(ApplicationConstants.SYNOPSYS_BRIDGE_LATEST_VERSION)) { + if (matcher.matches() || version.equals(ApplicationConstants.SYNOPSYS_BRIDGE_LATEST_VERSION)) { return true; } else { logger.warn(LogMessages.INVALID_BRIDGE_DOWNLOAD_VERSION_PROVIDED, version); @@ -100,33 +100,44 @@ public boolean isValidInstallationPath(String installationPath) { } } - public BridgeDownloadParameters getBridgeDownloadParams(Map<String, Object> scanParameters, BridgeDownloadParameters bridgeDownloadParameters) { + public BridgeDownloadParameters getBridgeDownloadParams( + Map<String, Object> scanParameters, BridgeDownloadParameters bridgeDownloadParameters) { if (scanParameters.containsKey(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY)) { - bridgeDownloadParameters.setBridgeInstallationPath( - scanParameters.get(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY).toString().trim()); + bridgeDownloadParameters.setBridgeInstallationPath(scanParameters + .get(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY) + .toString() + .trim()); } - boolean isNetworkAirgap = scanParameters.containsKey(ApplicationConstants.NETWORK_AIRGAP_KEY) && - ((Boolean)scanParameters.get(ApplicationConstants.NETWORK_AIRGAP_KEY)).equals(true); + boolean isNetworkAirgap = scanParameters.containsKey(ApplicationConstants.NETWORK_AIRGAP_KEY) + && ((Boolean) scanParameters.get(ApplicationConstants.NETWORK_AIRGAP_KEY)).equals(true); if (scanParameters.containsKey(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL)) { - bridgeDownloadParameters.setBridgeDownloadUrl( - scanParameters.get(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL).toString().trim()); - } - else if (scanParameters.containsKey(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION) && - !isNetworkAirgap) { - String desiredVersion = scanParameters.get(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION).toString().trim(); - String bridgeDownloadUrl = String.join("/", ApplicationConstants.BRIDGE_ARTIFACTORY_URL, - desiredVersion, getSynopsysBridgeZipFileName(desiredVersion)); + bridgeDownloadParameters.setBridgeDownloadUrl(scanParameters + .get(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL) + .toString() + .trim()); + } else if (scanParameters.containsKey(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION) + && !isNetworkAirgap) { + String desiredVersion = scanParameters + .get(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION) + .toString() + .trim(); + String bridgeDownloadUrl = String.join( + "/", + ApplicationConstants.BRIDGE_ARTIFACTORY_URL, + desiredVersion, + getSynopsysBridgeZipFileName(desiredVersion)); bridgeDownloadParameters.setBridgeDownloadUrl(bridgeDownloadUrl); bridgeDownloadParameters.setBridgeDownloadVersion(desiredVersion); - } - else { + } else { if (!isNetworkAirgap) { - String bridgeDownloadUrl = String.join("/", ApplicationConstants.BRIDGE_ARTIFACTORY_URL, - ApplicationConstants.SYNOPSYS_BRIDGE_LATEST_VERSION, getSynopsysBridgeZipFileName() - ); + String bridgeDownloadUrl = String.join( + "/", + ApplicationConstants.BRIDGE_ARTIFACTORY_URL, + ApplicationConstants.SYNOPSYS_BRIDGE_LATEST_VERSION, + getSynopsysBridgeZipFileName()); bridgeDownloadParameters.setBridgeDownloadUrl(bridgeDownloadUrl); } } @@ -145,9 +156,18 @@ public String getPlatform() { } public String getSynopsysBridgeZipFileName() { - return ApplicationConstants.BRIDGE_BINARY.concat("-").concat(getPlatform()).concat(".zip"); + return ApplicationConstants.BRIDGE_BINARY + .concat("-") + .concat(getPlatform()) + .concat(".zip"); } + public String getSynopsysBridgeZipFileName(String version) { - return ApplicationConstants.BRIDGE_BINARY.concat("-").concat(version).concat("-").concat(getPlatform()).concat(".zip"); + return ApplicationConstants.BRIDGE_BINARY + .concat("-") + .concat(version) + .concat("-") + .concat(getPlatform()) + .concat(".zip"); } } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java index af323e4e..afbc3d32 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java @@ -7,13 +7,13 @@ */ package io.jenkins.plugins.synopsys.security.scan.service.diagnostics; -import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import hudson.EnvVars; import hudson.FilePath; import hudson.Launcher; import hudson.model.Run; import hudson.model.TaskListener; import hudson.tasks.ArtifactArchiver; +import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; public class DiagnosticsService { private final Run<?, ?> run; @@ -23,8 +23,12 @@ public class DiagnosticsService { private final EnvVars envVars; private final ArtifactArchiver artifactArchiver; - public DiagnosticsService(Run<?, ?> run, TaskListener listener, Launcher launcher, EnvVars envVars, - ArtifactArchiver artifactArchiver) { + public DiagnosticsService( + Run<?, ?> run, + TaskListener listener, + Launcher launcher, + EnvVars envVars, + ArtifactArchiver artifactArchiver) { this.run = run; this.listener = listener; this.logger = new LoggerWrapper(listener); @@ -40,7 +44,8 @@ public void archiveDiagnostics(FilePath diagnosticsPath) { artifactArchiver.perform(run, diagnosticsPath, envVars, launcher, listener); } else { - logger.error("Archiving diagnostics failed as diagnostics path not found at: " + diagnosticsPath.getRemote()); + logger.error("Archiving diagnostics failed as diagnostics path not found at: " + + diagnosticsPath.getRemote()); return; } } catch (Exception e) { @@ -50,5 +55,4 @@ public void archiveDiagnostics(FilePath diagnosticsPath) { logger.info("Diagnostics archived successfully in jenkins artifact"); } - } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java index 0ffcabad..6752782e 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java @@ -7,13 +7,12 @@ */ package io.jenkins.plugins.synopsys.security.scan.service.scan; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.global.enums.SecurityProduct; import io.jenkins.plugins.synopsys.security.scan.service.scan.blackduck.BlackDuckParametersService; import io.jenkins.plugins.synopsys.security.scan.service.scan.coverity.CoverityParametersService; import io.jenkins.plugins.synopsys.security.scan.service.scan.polaris.PolarisParametersService; -import hudson.model.TaskListener; - import java.util.Arrays; import java.util.Map; import java.util.Set; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java index 10b1b096..0ac5b9b4 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java @@ -7,13 +7,12 @@ */ package io.jenkins.plugins.synopsys.security.scan.service.scan.blackduck; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import io.jenkins.plugins.synopsys.security.scan.input.blackduck.BlackDuck; import io.jenkins.plugins.synopsys.security.scan.input.blackduck.Download; - -import hudson.model.TaskListener; import java.util.*; public class BlackDuckParametersService { @@ -27,20 +26,19 @@ public boolean isValidBlackDuckParameters(Map<String, Object> blackDuckParameter if (blackDuckParameters == null || blackDuckParameters.isEmpty()) { return false; } - + List<String> invalidParams = new ArrayList<>(); - Arrays.asList(ApplicationConstants.BLACKDUCK_URL_KEY, - ApplicationConstants.BLACKDUCK_TOKEN_KEY) - .forEach(key -> { - boolean isKeyValid = blackDuckParameters.containsKey(key) - && blackDuckParameters.get(key) != null - && !blackDuckParameters.get(key).toString().isEmpty(); + Arrays.asList(ApplicationConstants.BLACKDUCK_URL_KEY, ApplicationConstants.BLACKDUCK_TOKEN_KEY) + .forEach(key -> { + boolean isKeyValid = blackDuckParameters.containsKey(key) + && blackDuckParameters.get(key) != null + && !blackDuckParameters.get(key).toString().isEmpty(); - if (!isKeyValid) { - invalidParams.add(key); - } - }); + if (!isKeyValid) { + invalidParams.add(key); + } + }); if (invalidParams.isEmpty()) { logger.info("BlackDuck parameters are validated successfully"); @@ -135,5 +133,4 @@ private void setDownloadUrl(BlackDuck blackDuck, String value) { private boolean isBoolean(String value) { return value.equals("true") || value.equals("false"); } - } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java index e72eddf3..bdfcbe14 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java @@ -7,11 +7,11 @@ */ package io.jenkins.plugins.synopsys.security.scan.service.scan.coverity; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import io.jenkins.plugins.synopsys.security.scan.input.coverity.Coverity; -import hudson.model.TaskListener; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -28,21 +28,22 @@ public boolean isValidCoverityParameters(Map<String, Object> coverityParameters) if (coverityParameters == null || coverityParameters.isEmpty()) { return false; } - + List<String> invalidParams = new ArrayList<>(); - Arrays.asList(ApplicationConstants.COVERITY_URL_KEY, - ApplicationConstants.COVERITY_USER_KEY, - ApplicationConstants.COVERITY_PASSPHRASE_KEY) - .forEach(key -> { - boolean isKeyValid = coverityParameters.containsKey(key) - && coverityParameters.get(key) != null - && !coverityParameters.get(key).toString().isEmpty(); + Arrays.asList( + ApplicationConstants.COVERITY_URL_KEY, + ApplicationConstants.COVERITY_USER_KEY, + ApplicationConstants.COVERITY_PASSPHRASE_KEY) + .forEach(key -> { + boolean isKeyValid = coverityParameters.containsKey(key) + && coverityParameters.get(key) != null + && !coverityParameters.get(key).toString().isEmpty(); - if (!isKeyValid) { - invalidParams.add(key); - } - }); + if (!isKeyValid) { + invalidParams.add(key); + } + }); if (invalidParams.isEmpty()) { logger.info("Coverity parameters are validated successfully"); diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java index 6b3e1721..071a9d60 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java @@ -7,11 +7,11 @@ */ package io.jenkins.plugins.synopsys.security.scan.service.scan.polaris; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import io.jenkins.plugins.synopsys.security.scan.input.polaris.Polaris; -import hudson.model.TaskListener; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -31,7 +31,8 @@ public boolean isValidPolarisParameters(Map<String, Object> polarisParameters) { List<String> invalidParams = new ArrayList<>(); - Arrays.asList(ApplicationConstants.POLARIS_SERVER_URL_KEY, + Arrays.asList( + ApplicationConstants.POLARIS_SERVER_URL_KEY, ApplicationConstants.POLARIS_ACCESS_TOKEN_KEY, ApplicationConstants.POLARIS_APPLICATION_NAME_KEY, ApplicationConstants.POLARIS_ASSESSMENT_TYPES_KEY) @@ -81,9 +82,9 @@ public Polaris preparePolarisObjectForBridge(Map<String, Object> polarisParamete case ApplicationConstants.POLARIS_BRANCH_NAME_KEY: polaris.getBranch().setName(value); break; -// case ApplicationConstants.BRIDGE_POLARIS_BRANCH_PARENT_NAME_KEY: -// polaris.getBranch().getParent().setName(value); -// break; + // case ApplicationConstants.BRIDGE_POLARIS_BRANCH_PARENT_NAME_KEY: + // polaris.getBranch().getParent().setName(value); + // break; case ApplicationConstants.POLARIS_ASSESSMENT_TYPES_KEY: if (!value.isEmpty()) { List<String> assessmentTypes = new ArrayList<>(); diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java index b083ee7a..42b86f1c 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java @@ -10,6 +10,7 @@ import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource; import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketApi; import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.global.LogMessages; @@ -18,8 +19,6 @@ import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Bitbucket; import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Pull; import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Repository; -import hudson.model.TaskListener; - import java.util.Map; public class BitbucketRepositoryService { @@ -29,10 +28,12 @@ public BitbucketRepositoryService(TaskListener listener) { this.logger = new LoggerWrapper(listener); } - public Bitbucket fetchBitbucketRepositoryDetails(Map<String, Object> scanParameters, - BitbucketSCMSource bitbucketSCMSource, - Integer projectRepositoryPullNumber, - boolean isFixPrOrPrComment) throws PluginExceptionHandler { + public Bitbucket fetchBitbucketRepositoryDetails( + Map<String, Object> scanParameters, + BitbucketSCMSource bitbucketSCMSource, + Integer projectRepositoryPullNumber, + boolean isFixPrOrPrComment) + throws PluginExceptionHandler { String bitbucketToken = (String) scanParameters.get(ApplicationConstants.BITBUCKET_TOKEN_KEY); if (Utility.isStringNullOrBlank(bitbucketToken) && isFixPrOrPrComment) { @@ -40,13 +41,15 @@ public Bitbucket fetchBitbucketRepositoryDetails(Map<String, Object> scanParamet throw new PluginExceptionHandler(LogMessages.NO_BITBUCKET_TOKEN_FOUND); } - BitbucketApi bitbucketApiFromSCMSource = bitbucketSCMSource.buildBitbucketClient(bitbucketSCMSource.getRepoOwner(), bitbucketSCMSource.getRepository()); + BitbucketApi bitbucketApiFromSCMSource = bitbucketSCMSource.buildBitbucketClient( + bitbucketSCMSource.getRepoOwner(), bitbucketSCMSource.getRepository()); BitbucketRepository bitbucketRepository = null; try { bitbucketRepository = bitbucketApiFromSCMSource.getRepository(); } catch (Exception e) { - logger.error("An exception occurred while getting the BitbucketRepository from BitbucketApi: " + e.getMessage()); + logger.error( + "An exception occurred while getting the BitbucketRepository from BitbucketApi: " + e.getMessage()); } String serverUrl = bitbucketSCMSource.getServerUrl(); @@ -58,10 +61,16 @@ public Bitbucket fetchBitbucketRepositoryDetails(Map<String, Object> scanParamet projectKey = bitbucketRepository.getProject().getKey(); } - return createBitbucketObject(serverUrl, bitbucketToken, projectRepositoryPullNumber, repositoryName, projectKey); + return createBitbucketObject( + serverUrl, bitbucketToken, projectRepositoryPullNumber, repositoryName, projectKey); } - public static Bitbucket createBitbucketObject(String serverUrl, String bitbucketToken, Integer projectRepositoryPullNumber, String repositoryName, String projectKey) { + public static Bitbucket createBitbucketObject( + String serverUrl, + String bitbucketToken, + Integer projectRepositoryPullNumber, + String repositoryName, + String projectKey) { Bitbucket bitbucket = new Bitbucket(); bitbucket.getApi().setUrl(serverUrl); bitbucket.getApi().setToken(bitbucketToken); @@ -78,5 +87,4 @@ public static Bitbucket createBitbucketObject(String serverUrl, String bitbucket return bitbucket; } - } diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java index 35139be9..480c3c05 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java @@ -8,12 +8,11 @@ package io.jenkins.plugins.synopsys.security.scan.service.scm; import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource; -import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; -import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import hudson.EnvVars; import hudson.model.TaskListener; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import java.util.Map; - import jenkins.model.Jenkins; import jenkins.scm.api.SCMSource; import jenkins.scm.api.SCMSourceOwner; @@ -27,23 +26,25 @@ public SCMRepositoryService(TaskListener listener, EnvVars envVars) { this.envVars = envVars; } - public Object fetchSCMRepositoryDetails(Map<String, Object> scanParameters, boolean isFixPrOrPrComment) throws PluginExceptionHandler { - Integer projectRepositoryPullNumber = envVars.get(ApplicationConstants.ENV_CHANGE_ID_KEY) != null ? - Integer.parseInt(envVars.get(ApplicationConstants.ENV_CHANGE_ID_KEY)) : null; + public Object fetchSCMRepositoryDetails(Map<String, Object> scanParameters, boolean isFixPrOrPrComment) + throws PluginExceptionHandler { + Integer projectRepositoryPullNumber = envVars.get(ApplicationConstants.ENV_CHANGE_ID_KEY) != null + ? Integer.parseInt(envVars.get(ApplicationConstants.ENV_CHANGE_ID_KEY)) + : null; SCMSource scmSource = findSCMSource(); if (scmSource instanceof BitbucketSCMSource) { BitbucketRepositoryService bitbucketRepositoryService = new BitbucketRepositoryService(listener); BitbucketSCMSource bitbucketSCMSource = (BitbucketSCMSource) scmSource; return bitbucketRepositoryService.fetchBitbucketRepositoryDetails( - scanParameters, bitbucketSCMSource, projectRepositoryPullNumber, isFixPrOrPrComment); + scanParameters, bitbucketSCMSource, projectRepositoryPullNumber, isFixPrOrPrComment); } return null; } public SCMSource findSCMSource() { String jobName = envVars.get(ApplicationConstants.ENV_JOB_NAME_KEY) - .substring(0, envVars.get(ApplicationConstants.ENV_JOB_NAME_KEY).indexOf("/")); + .substring(0, envVars.get(ApplicationConstants.ENV_JOB_NAME_KEY).indexOf("/")); Jenkins jenkins = Jenkins.getInstanceOrNull(); SCMSourceOwner owner = jenkins != null ? jenkins.getItemByFullName(jobName, SCMSourceOwner.class) : null; if (owner != null) { @@ -55,5 +56,4 @@ public SCMSource findSCMSource() { } return null; } - } diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandlerTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandlerTest.java index d62d124e..f82291bf 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandlerTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandlerTest.java @@ -3,13 +3,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import hudson.EnvVars; +import hudson.FilePath; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; import io.jenkins.plugins.synopsys.security.scan.exception.ScannerException; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.service.scan.ScanParametersService; -import hudson.EnvVars; -import hudson.FilePath; -import hudson.model.TaskListener; import java.io.File; import java.io.PrintStream; import java.util.HashMap; @@ -31,8 +31,9 @@ void setUp() { workspace = new FilePath(new File(System.getProperty("user.home"))); listenerMock = Mockito.mock(TaskListener.class); envVarsMock = Mockito.mock(EnvVars.class); - pluginParametersHandler = new PluginParametersHandler(securityScannerMock, workspace, envVarsMock, listenerMock); - + pluginParametersHandler = + new PluginParametersHandler(securityScannerMock, workspace, envVarsMock, listenerMock); + Mockito.when(listenerMock.getLogger()).thenReturn(Mockito.mock(PrintStream.class)); } @@ -55,7 +56,8 @@ public void initializeScannerInvalidParametersTest() { Map<String, Object> scanParameters = new HashMap<>(); scanParameters.put(ApplicationConstants.PRODUCT_KEY, "BLACKDUCK"); - Mockito.when(mockScanParametersService.isValidScanParameters(scanParameters)).thenReturn(false); + Mockito.when(mockScanParametersService.isValidScanParameters(scanParameters)) + .thenReturn(false); assertThrows(PluginExceptionHandler.class, () -> pluginParametersHandler.initializeScanner(scanParameters)); } @@ -84,5 +86,4 @@ public void initializeScannerAirGapSuccessTest() throws PluginExceptionHandler, assertEquals(0, exitCode); } - } diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManagerTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManagerTest.java index cf5d1606..9b72f30c 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManagerTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManagerTest.java @@ -1,17 +1,18 @@ package io.jenkins.plugins.synopsys.security.scan.bridge; -import io.jenkins.plugins.synopsys.security.scan.global.Utility; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.anyString; + import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; import java.io.File; import java.io.IOException; import java.io.PrintStream; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.anyString; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; public class BridgeDownloadManagerTest { private BridgeDownloadManager bridgeDownloadManager; @@ -31,7 +32,7 @@ public void getInstalledBridgeVersionTest() { String versionFilePath = null; String os = System.getProperty("os.name").toLowerCase(); - if(os.contains("win")) { + if (os.contains("win")) { versionFilePath = new File("src\\test\\resources\\versions.txt").getAbsolutePath(); } else { @@ -54,7 +55,8 @@ void isSynopsysBridgeDownloadRequiredTest() { BridgeDownloadManager bridgeDownloadManager = new BridgeDownloadManager(workspace, listenerMock, envVarsMock); - Mockito.when(mockedBridgeDownloadManager.checkIfBridgeInstalled(anyString())).thenReturn(true); + Mockito.when(mockedBridgeDownloadManager.checkIfBridgeInstalled(anyString())) + .thenReturn(true); boolean isDownloadRequired = bridgeDownloadManager.isSynopsysBridgeDownloadRequired(bridgeDownloadParameters); assertTrue(isDownloadRequired); @@ -64,12 +66,14 @@ void isSynopsysBridgeDownloadRequiredTest() { public void getDirectoryUrlTest() { BridgeDownloadManager bridgeDownloadManager = new BridgeDownloadManager(workspace, listenerMock, envVarsMock); - String downloadUrlWithoutTrailingSlash = "https://myown.artifactory.com/release/synopsys-bridge/0.3.59/synopsys-bridge-0.3.59-linux64.zip"; + String downloadUrlWithoutTrailingSlash = + "https://myown.artifactory.com/release/synopsys-bridge/0.3.59/synopsys-bridge-0.3.59-linux64.zip"; String directoryUrl = "https://myown.artifactory.com/release/synopsys-bridge/0.3.59"; assertEquals(directoryUrl, bridgeDownloadManager.getDirectoryUrl(downloadUrlWithoutTrailingSlash)); - String downloadUrlWithTrailingSlash = "https://myown.artifactory.com/release/synopsys-bridge/latest/synopsys-bridge-linux64.zip/"; + String downloadUrlWithTrailingSlash = + "https://myown.artifactory.com/release/synopsys-bridge/latest/synopsys-bridge-linux64.zip/"; String expectedDirectoryUrl = "https://myown.artifactory.com/release/synopsys-bridge/latest"; assertEquals(expectedDirectoryUrl, bridgeDownloadManager.getDirectoryUrl(downloadUrlWithTrailingSlash)); @@ -79,8 +83,10 @@ public void getDirectoryUrlTest() { public void versionFileAvailableTest() { BridgeDownloadManager bridgeDownloadManager = new BridgeDownloadManager(workspace, listenerMock, envVarsMock); - String directoryUrlWithoutVersionFile = "https://sig-repo.synopsys.com/artifactory/bds-integrations-release/com/synopsys/integration/synopsys-bridge/0.3.1/"; - String directoryUrlWithVersionFile = "https://sig-repo.synopsys.com/artifactory/bds-integrations-release/com/synopsys/integration/synopsys-bridge/latest/"; + String directoryUrlWithoutVersionFile = + "https://sig-repo.synopsys.com/artifactory/bds-integrations-release/com/synopsys/integration/synopsys-bridge/0.3.1/"; + String directoryUrlWithVersionFile = + "https://sig-repo.synopsys.com/artifactory/bds-integrations-release/com/synopsys/integration/synopsys-bridge/latest/"; assertFalse(bridgeDownloadManager.isVersionFileAvailableInArtifactory(directoryUrlWithoutVersionFile)); assertTrue(bridgeDownloadManager.isVersionFileAvailableInArtifactory(directoryUrlWithVersionFile)); @@ -90,12 +96,14 @@ public void versionFileAvailableTest() { public void extractVersionFromUrlTest() { BridgeDownloadManager bridgeDownloadManager = new BridgeDownloadManager(workspace, listenerMock, envVarsMock); - String urlWithVersion = "https://myown.artifactory.com/synopsys-bridge/0.3.59/synopsys-bridge-0.3.59-linux64.zip"; + String urlWithVersion = + "https://myown.artifactory.com/synopsys-bridge/0.3.59/synopsys-bridge-0.3.59-linux64.zip"; String expectedVersionWithVersion = "0.3.59"; assertEquals(expectedVersionWithVersion, bridgeDownloadManager.extractVersionFromUrl(urlWithVersion)); - String urlWithoutVersion = "https://myown.artifactory.com/synopsys-bridge/latest/synopsys-bridge-latest-linux64.zip"; + String urlWithoutVersion = + "https://myown.artifactory.com/synopsys-bridge/latest/synopsys-bridge-latest-linux64.zip"; String expectedVersionWithLatest = "NA"; assertEquals(expectedVersionWithLatest, bridgeDownloadManager.extractVersionFromUrl(urlWithoutVersion)); @@ -105,7 +113,8 @@ public void extractVersionFromUrlTest() { public void downloadVersionFileTest() { BridgeDownloadManager bridgeDownloadManager = new BridgeDownloadManager(workspace, listenerMock, envVarsMock); - String directoryUrl = "https://sig-repo.synopsys.com/artifactory/bds-integrations-release/com/synopsys/integration/synopsys-bridge/latest"; + String directoryUrl = + "https://sig-repo.synopsys.com/artifactory/bds-integrations-release/com/synopsys/integration/synopsys-bridge/latest"; String tempVersionFilePath = bridgeDownloadManager.downloadVersionFileFromArtifactory(directoryUrl); FilePath tempVersionFile = new FilePath(new File(tempVersionFilePath)); @@ -115,24 +124,28 @@ public void downloadVersionFileTest() { } catch (IOException | InterruptedException e) { System.out.println("Exception while checking the existence of downloaded version file."); } - Utility.removeFile(tempVersionFilePath, new FilePath(new File(getHomeDirectory())), listenerMock ); + Utility.removeFile(tempVersionFilePath, new FilePath(new File(getHomeDirectory())), listenerMock); } @Test void getLatestBridgeVersionFromArtifactoryTest() { BridgeDownloadManager bridgeDownloadManager = new BridgeDownloadManager(workspace, listenerMock, envVarsMock); - String urlWithVersion = "https://sig-repo.synopsys.com/artifactory/bds-integrations-release/com/synopsys/integration/synopsys-bridge/0.3.1/synopsys-bridge-0.3.1-linux64.zip "; + String urlWithVersion = + "https://sig-repo.synopsys.com/artifactory/bds-integrations-release/com/synopsys/integration/synopsys-bridge/0.3.1/synopsys-bridge-0.3.1-linux64.zip "; String resultWithVersion = bridgeDownloadManager.getLatestBridgeVersionFromArtifactory(urlWithVersion); assertEquals("0.3.1", resultWithVersion); - String urlWithoutVersion = "https://sig-repo.synopsys.com/artifactory/bds-integrations-release/com/synopsys/integration/synopsys-bridge/latest/synopsys-bridge-linux64.zip"; + String urlWithoutVersion = + "https://sig-repo.synopsys.com/artifactory/bds-integrations-release/com/synopsys/integration/synopsys-bridge/latest/synopsys-bridge-linux64.zip"; BridgeDownloadManager mockedBridgeDownloadManager = Mockito.mock(BridgeDownloadManager.class); String expectedVersion = "0.3.59"; - Mockito.when(mockedBridgeDownloadManager.getLatestBridgeVersionFromArtifactory(urlWithoutVersion)).thenReturn(expectedVersion); + Mockito.when(mockedBridgeDownloadManager.getLatestBridgeVersionFromArtifactory(urlWithoutVersion)) + .thenReturn(expectedVersion); - String resultWithoutVersion = mockedBridgeDownloadManager.getLatestBridgeVersionFromArtifactory(urlWithoutVersion); + String resultWithoutVersion = + mockedBridgeDownloadManager.getLatestBridgeVersionFromArtifactory(urlWithoutVersion); assertEquals(expectedVersion, resultWithoutVersion); } diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadTest.java index ec6285d0..e141b855 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadTest.java @@ -1,20 +1,21 @@ package io.jenkins.plugins.synopsys.security.scan.bridge; -import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; -import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; -import io.jenkins.plugins.synopsys.security.scan.global.Utility; +import static org.junit.jupiter.api.Assertions.*; + import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.*; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.global.Utility; import java.io.File; import java.io.PrintStream; import java.net.HttpURLConnection; import java.nio.file.Files; import java.nio.file.Paths; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.*; public class BridgeDownloadTest { private TaskListener listenerMock; @@ -33,23 +34,25 @@ public void setUp() { public void downloadSynopsysBridgeTest() throws Exception { BridgeDownload bridgeDownload = new BridgeDownload(workspace, listenerMock, envVarsMock); - String validBridgeDownloadUrl = String.join("/", - ApplicationConstants.BRIDGE_ARTIFACTORY_URL, "latest", "versions.txt"); + String validBridgeDownloadUrl = + String.join("/", ApplicationConstants.BRIDGE_ARTIFACTORY_URL, "latest", "versions.txt"); String invalidBridgeDownloadUrl = "https://bridge.invalid.url"; - FilePath validBridgeDownloadPath = bridgeDownload.downloadSynopsysBridge(validBridgeDownloadUrl, workspace.getRemote()); + FilePath validBridgeDownloadPath = + bridgeDownload.downloadSynopsysBridge(validBridgeDownloadUrl, workspace.getRemote()); - assertTrue(Files.exists( Paths.get(validBridgeDownloadPath.getRemote()))); - assertThrows(PluginExceptionHandler.class, () -> - bridgeDownload.downloadSynopsysBridge(invalidBridgeDownloadUrl, workspace.getRemote())); + assertTrue(Files.exists(Paths.get(validBridgeDownloadPath.getRemote()))); + assertThrows( + PluginExceptionHandler.class, + () -> bridgeDownload.downloadSynopsysBridge(invalidBridgeDownloadUrl, workspace.getRemote())); Utility.removeFile(validBridgeDownloadPath.getRemote(), workspace, listenerMock); } @Test public void getHttpStatusCodeTest() { - String bridgeDownloadUrl = String.join("/", - ApplicationConstants.BRIDGE_ARTIFACTORY_URL, "latest", "synopsys-bridge-linux64.zip"); + String bridgeDownloadUrl = + String.join("/", ApplicationConstants.BRIDGE_ARTIFACTORY_URL, "latest", "synopsys-bridge-linux64.zip"); String invalidDownloadUrl = "https://invalid.bridge-download.url"; BridgeDownload bridgeDownload = new BridgeDownload(workspace, listenerMock, envVarsMock); @@ -75,8 +78,8 @@ public void terminateRetryTest() { @Test public void checkIfBridgeUrlExistsTest() { - String bridgeDownloadUrl = String.join("/", - ApplicationConstants.BRIDGE_ARTIFACTORY_URL, "latest", "synopsys-bridge-linux64.zip"); + String bridgeDownloadUrl = + String.join("/", ApplicationConstants.BRIDGE_ARTIFACTORY_URL, "latest", "synopsys-bridge-linux64.zip"); String invalidUrl = "https://invalid.bridge-download.url"; BridgeDownload bridgeDownload = new BridgeDownload(workspace, listenerMock, envVarsMock); diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstallTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstallTest.java index 6b3d9980..393f44d1 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstallTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstallTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; + import hudson.FilePath; import hudson.model.TaskListener; import java.io.File; @@ -29,7 +30,7 @@ void installSynopsysBridgeTest() { String os = System.getProperty("os.name").toLowerCase(); FilePath destinationBridge = bridgeInstallationPath.child("demo-bridge.zip"); - if(os.contains("win")) { + if (os.contains("win")) { sourceBridge = new FilePath(new File("src\\test\\resources\\demo-bridge.zip")); } else { sourceBridge = new FilePath(new File("src/test/resources/demo-bridge.zip")); @@ -40,10 +41,8 @@ void installSynopsysBridgeTest() { bridgeInstall.installSynopsysBridge(getFullZipPath(), bridgeInstallationPath); assertFalse(destinationBridge.exists()); - assertTrue( - bridgeInstallationPath.child("demo-bridge-extensions").isDirectory()); - assertTrue( - bridgeInstallationPath.child("demo-bridge-versions.txt").exists()); + assertTrue(bridgeInstallationPath.child("demo-bridge-extensions").isDirectory()); + assertTrue(bridgeInstallationPath.child("demo-bridge-versions.txt").exists()); assertTrue(bridgeInstallationPath.child("demo-bridge-LICENSE.txt").exists()); cleanupBridgeInstallationPath(bridgeInstallationPath); @@ -58,10 +57,12 @@ public String getHomeDirectory() { public FilePath getFullZipPath() { FilePath bridgeZipPath; - if(getHomeDirectory().contains("\\")) { - bridgeZipPath = new FilePath(new File(bridgeInstallationPath.getRemote().concat("\\").concat("demo-bridge.zip"))); + if (getHomeDirectory().contains("\\")) { + bridgeZipPath = new FilePath( + new File(bridgeInstallationPath.getRemote().concat("\\").concat("demo-bridge.zip"))); } else { - bridgeZipPath = new FilePath(new File(bridgeInstallationPath.getRemote().concat("/").concat("demo-bridge.zip"))); + bridgeZipPath = new FilePath( + new File(bridgeInstallationPath.getRemote().concat("/").concat("demo-bridge.zip"))); } return bridgeZipPath; } diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactoryTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactoryTest.java index ae7876a7..20de70c0 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactoryTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactoryTest.java @@ -1,20 +1,21 @@ package io.jenkins.plugins.synopsys.security.scan.factory; -import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; -import io.jenkins.plugins.synopsys.security.scan.extension.pipeline.SecurityScanStep; -import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import static org.junit.jupiter.api.Assertions.*; + import hudson.AbortException; import hudson.EnvVars; import hudson.FilePath; import hudson.model.TaskListener; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; +import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; +import io.jenkins.plugins.synopsys.security.scan.extension.pipeline.SecurityScanStep; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import java.io.File; import java.io.PrintStream; import java.util.HashMap; import java.util.Map; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; public class ScanParametersFactoryTest { private TaskListener listenerMock; @@ -41,8 +42,8 @@ public void preparePipelineParametersMapTest() throws AbortException, PluginExce globalConfigValues.put(ApplicationConstants.BLACKDUCK_TOKEN_KEY, "fake-blackduck-token"); globalConfigValues.put(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY, "/fake/path"); - Map<String, Object> result = ScanParametersFactory.preparePipelineParametersMap(securityScanStep, - globalConfigValues, listenerMock); + Map<String, Object> result = + ScanParametersFactory.preparePipelineParametersMap(securityScanStep, globalConfigValues, listenerMock); assertEquals(5, result.size()); assertEquals("BLACKDUCK", result.get(ApplicationConstants.PRODUCT_KEY)); @@ -52,8 +53,10 @@ public void preparePipelineParametersMapTest() throws AbortException, PluginExce securityScanStep.setProduct("invalid-product"); - assertThrows(PluginExceptionHandler.class, () -> ScanParametersFactory.preparePipelineParametersMap(securityScanStep, - globalConfigValues, listenerMock)); + assertThrows( + PluginExceptionHandler.class, + () -> ScanParametersFactory.preparePipelineParametersMap( + securityScanStep, globalConfigValues, listenerMock)); } @Test @@ -66,7 +69,8 @@ public void prepareBlackDuckParametersMapTest() { securityScanStep.setBlackduck_download_url("https://fake.blackduck-download-url"); securityScanStep.setBlackduck_scan_failure_severities("MAJOR"); - Map<String, Object> blackDuckParametersMap = ScanParametersFactory.prepareBlackDuckParametersMap(securityScanStep); + Map<String, Object> blackDuckParametersMap = + ScanParametersFactory.prepareBlackDuckParametersMap(securityScanStep); assertEquals(7, blackDuckParametersMap.size()); assertEquals("https://fake.blackduck-url", blackDuckParametersMap.get(ApplicationConstants.BLACKDUCK_URL_KEY)); @@ -74,11 +78,14 @@ public void prepareBlackDuckParametersMapTest() { assertEquals("/fake/path", blackDuckParametersMap.get(ApplicationConstants.BLACKDUCK_INSTALL_DIRECTORY_KEY)); assertTrue((boolean) blackDuckParametersMap.get(ApplicationConstants.BLACKDUCK_SCAN_FULL_KEY)); assertTrue((boolean) blackDuckParametersMap.get(ApplicationConstants.BLACKDUCK_AUTOMATION_PRCOMMENT_KEY)); - assertEquals("https://fake.blackduck-download-url", blackDuckParametersMap.get(ApplicationConstants.BLACKDUCK_DOWNLOAD_URL_KEY)); + assertEquals( + "https://fake.blackduck-download-url", + blackDuckParametersMap.get(ApplicationConstants.BLACKDUCK_DOWNLOAD_URL_KEY)); assertEquals("MAJOR", blackDuckParametersMap.get(ApplicationConstants.BLACKDUCK_SCAN_FAILURE_SEVERITIES_KEY)); - Map<String, Object> emptyBlackDuckParametersMap = ScanParametersFactory.prepareBlackDuckParametersMap(new SecurityScanStep()); - + Map<String, Object> emptyBlackDuckParametersMap = + ScanParametersFactory.prepareBlackDuckParametersMap(new SecurityScanStep()); + assertEquals(0, emptyBlackDuckParametersMap.size()); } @@ -95,7 +102,8 @@ public void prepareCoverityParametersMapTest() { securityScanStep.setCoverity_version("1.0.0"); securityScanStep.setCoverity_local(true); - Map<String, Object> coverityParametersMap = ScanParametersFactory.prepareCoverityParametersMap(securityScanStep); + Map<String, Object> coverityParametersMap = + ScanParametersFactory.prepareCoverityParametersMap(securityScanStep); assertEquals(10, coverityParametersMap.size()); assertEquals("https://fake.coverity-url", coverityParametersMap.get(ApplicationConstants.COVERITY_URL_KEY)); @@ -109,7 +117,8 @@ public void prepareCoverityParametersMapTest() { assertEquals("1.0.0", coverityParametersMap.get(ApplicationConstants.COVERITY_VERSION_KEY)); assertTrue(coverityParametersMap.containsKey(ApplicationConstants.COVERITY_LOCAL_KEY)); - Map<String, Object> emptyCoverityParametersMap = ScanParametersFactory.prepareCoverityParametersMap(new SecurityScanStep()); + Map<String, Object> emptyCoverityParametersMap = + ScanParametersFactory.prepareCoverityParametersMap(new SecurityScanStep()); assertEquals(0, emptyCoverityParametersMap.size()); } @@ -124,13 +133,16 @@ public void prepareBridgeParametersMapTest() { Map<String, Object> bridgeParametersMap = ScanParametersFactory.prepareBridgeParametersMap(securityScanStep); assertEquals(5, bridgeParametersMap.size()); - assertEquals("https://fake.bridge-download.url", bridgeParametersMap.get(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL)); + assertEquals( + "https://fake.bridge-download.url", + bridgeParametersMap.get(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL)); assertEquals("1.0.0", bridgeParametersMap.get(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION)); assertEquals("/fake/path", bridgeParametersMap.get(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY)); assertTrue((boolean) bridgeParametersMap.get(ApplicationConstants.INCLUDE_DIAGNOSTICS_KEY)); assertTrue((boolean) bridgeParametersMap.get(ApplicationConstants.NETWORK_AIRGAP_KEY)); - Map<String, Object> emptyBridgeParametersMap = ScanParametersFactory.prepareBridgeParametersMap(new SecurityScanStep()); + Map<String, Object> emptyBridgeParametersMap = + ScanParametersFactory.prepareBridgeParametersMap(new SecurityScanStep()); assertEquals(0, emptyBridgeParametersMap.size()); } @@ -148,7 +160,9 @@ public void preparePolarisParametersMapTest() { Map<String, Object> polarisParametersMap = ScanParametersFactory.preparePolarisParametersMap(securityScanStep); assertEquals(7, polarisParametersMap.size()); - assertEquals("https://fake.polaris-server.url", polarisParametersMap.get(ApplicationConstants.POLARIS_SERVER_URL_KEY)); + assertEquals( + "https://fake.polaris-server.url", + polarisParametersMap.get(ApplicationConstants.POLARIS_SERVER_URL_KEY)); assertEquals("fake-access-token", polarisParametersMap.get(ApplicationConstants.POLARIS_ACCESS_TOKEN_KEY)); assertEquals("test", polarisParametersMap.get(ApplicationConstants.POLARIS_BRANCH_NAME_KEY)); assertEquals("REQUIRED", polarisParametersMap.get(ApplicationConstants.POLARIS_TRIAGE_KEY)); @@ -161,12 +175,12 @@ public void getSynopsysBridgeDownloadUrlBasedOnAgentOSTest() { String downloadUrlWindows = "https://fake-url.com/windows"; String os = System.getProperty("os.name").toLowerCase(); - String agentSpecificDownloadUrl = ScanParametersFactory - .getSynopsysBridgeDownloadUrlBasedOnAgentOS(workspace, listenerMock, downloadUrlMac,downloadUrlLinux,downloadUrlWindows); + String agentSpecificDownloadUrl = ScanParametersFactory.getSynopsysBridgeDownloadUrlBasedOnAgentOS( + workspace, listenerMock, downloadUrlMac, downloadUrlLinux, downloadUrlWindows); - if(os.contains("linux")) { + if (os.contains("linux")) { assertEquals(downloadUrlLinux, agentSpecificDownloadUrl); - } else if(os.contains("mac")) { + } else if (os.contains("mac")) { assertEquals(downloadUrlMac, agentSpecificDownloadUrl); } else { assertEquals(downloadUrlWindows, agentSpecificDownloadUrl); diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java index 919ff593..eabc69f7 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java @@ -44,7 +44,7 @@ public void getDirectorySeparatorTest() { String separator = Utility.getDirectorySeparator(workspace, listenerMock); String osName = System.getProperty("os.name").toLowerCase(); - if(osName.contains("win")) { + if (osName.contains("win")) { assertEquals("\\", separator); } else { assertEquals("/", separator); @@ -81,7 +81,7 @@ public void isStringNullOrBlankTest() { assertTrue(Utility.isStringNullOrBlank(emptyStringContainingSpace)); assertFalse(Utility.isStringNullOrBlank(validString)); } - + @Test public void getHttpURLConnectionTest() { EnvVars envVars = new EnvVars(); @@ -133,11 +133,16 @@ public void getEnvOrSystemProxyDetailsTest() { envVars.put("HTTP_PROXY", "https://fake-proxy.com:1010"); envVars.put("HTTPS_PROXY", "https://fake-proxy.com:1010"); - assertEquals(envVars.get("NO_PROXY"), Utility.getEnvOrSystemProxyDetails(ApplicationConstants.NO_PROXY, envVars)); - assertEquals(envVars.get("HTTP_PROXY"), Utility.getEnvOrSystemProxyDetails(ApplicationConstants.HTTP_PROXY, envVars)); - assertEquals(envVars.get("HTTPS_PROXY"), Utility.getEnvOrSystemProxyDetails(ApplicationConstants.HTTPS_PROXY, envVars)); + assertEquals( + envVars.get("NO_PROXY"), Utility.getEnvOrSystemProxyDetails(ApplicationConstants.NO_PROXY, envVars)); + assertEquals( + envVars.get("HTTP_PROXY"), + Utility.getEnvOrSystemProxyDetails(ApplicationConstants.HTTP_PROXY, envVars)); + assertEquals( + envVars.get("HTTPS_PROXY"), + Utility.getEnvOrSystemProxyDetails(ApplicationConstants.HTTPS_PROXY, envVars)); } - + @Test public void setDefaultProxyAuthenticatorTest() { Authenticator.setDefault(null); @@ -150,7 +155,7 @@ public void setDefaultProxyAuthenticatorTest() { assertNotNull(passwordAuth); assertEquals("username", passwordAuth.getUserName()); assertArrayEquals("password".toCharArray(), passwordAuth.getPassword()); - + Authenticator.setDefault(null); } diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentServiceTest.java index dadefc73..614390e9 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentServiceTest.java @@ -1,5 +1,10 @@ package io.jenkins.plugins.synopsys.security.scan.service; +import static org.junit.jupiter.api.Assertions.*; + +import hudson.EnvVars; +import hudson.FilePath; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.global.BridgeParams; @@ -8,9 +13,6 @@ import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Bitbucket; import io.jenkins.plugins.synopsys.security.scan.input.blackduck.BlackDuck; import io.jenkins.plugins.synopsys.security.scan.input.coverity.Coverity; -import hudson.EnvVars; -import hudson.FilePath; -import hudson.model.TaskListener; import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -24,7 +26,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.*; public class ScannerArgumentServiceTest { private Bitbucket bitBucket; @@ -54,12 +55,15 @@ void createBlackDuckInputJsonTest() { blackDuck.setUrl("https://fake.blackduck.url"); blackDuck.setToken("MDJDSROSVC56FAKEKEY"); - String inputJsonPath = scannerArgumentService.createBridgeInputJson(blackDuck, bitBucket, false, - null, ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX); + String inputJsonPath = scannerArgumentService.createBridgeInputJson( + blackDuck, bitBucket, false, null, ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX); Path filePath = Paths.get(inputJsonPath); - assertTrue(Files.exists(filePath), String.format("File %s does not exist at the specified path.", - ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX.concat(".json"))); + assertTrue( + Files.exists(filePath), + String.format( + "File %s does not exist at the specified path.", + ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX.concat(".json"))); Utility.removeFile(filePath.toString(), workspace, listenerMock); } @@ -75,9 +79,11 @@ public void setScmObjectTest() { @Test public void writeInputJsonToFileTest() { - String jsonString = "{\"data\":{\"blackduck\":{\"url\":\"https://fake.blackduck.url\",\"token\":\"MDJDSROSVC56FAKEKEY\"}}}"; + String jsonString = + "{\"data\":{\"blackduck\":{\"url\":\"https://fake.blackduck.url\",\"token\":\"MDJDSROSVC56FAKEKEY\"}}}"; - String jsonPath = scannerArgumentService.writeInputJsonToFile(jsonString, ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX); + String jsonPath = scannerArgumentService.writeInputJsonToFile( + jsonString, ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX); String fileContent = null; try { fileContent = new String(Files.readAllBytes(Paths.get(jsonPath))); @@ -85,9 +91,12 @@ public void writeInputJsonToFileTest() { e.printStackTrace(); } - assertTrue(Files.exists(Path.of(jsonPath)), String.format("%s does not exist at the specified path.", - ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX.concat(".json"))); - assertEquals(jsonString,fileContent); + assertTrue( + Files.exists(Path.of(jsonPath)), + String.format( + "%s does not exist at the specified path.", + ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX.concat(".json"))); + assertEquals(jsonString, fileContent); Utility.removeFile(jsonPath, workspace, listenerMock); } @@ -99,12 +108,15 @@ public void createCoverityInputJsonTest() { coverity.getConnect().getUser().setName("fake-user"); coverity.getConnect().getUser().setPassword("fakeUserPassword"); - String inputJsonPath = scannerArgumentService.createBridgeInputJson(coverity, bitBucket, false, - null, ApplicationConstants.COVERITY_INPUT_JSON_PREFIX); + String inputJsonPath = scannerArgumentService.createBridgeInputJson( + coverity, bitBucket, false, null, ApplicationConstants.COVERITY_INPUT_JSON_PREFIX); Path filePath = Paths.get(inputJsonPath); - assertTrue(Files.exists(filePath), String.format("File %s does not exist at the specified path.", - ApplicationConstants.COVERITY_INPUT_JSON_PREFIX.concat(".json"))); + assertTrue( + Files.exists(filePath), + String.format( + "File %s does not exist at the specified path.", + ApplicationConstants.COVERITY_INPUT_JSON_PREFIX.concat(".json"))); Utility.removeFile(filePath.toString(), workspace, listenerMock); } @@ -119,18 +131,25 @@ public void getCommandLineArgsForBlackDuckTest() throws PluginExceptionHandler { List<String> commandLineArgs = scannerArgumentService.getCommandLineArgs(blackDuckParametersMap, workspace); - if(getOSNameForTest().contains("win")) { - assertEquals(commandLineArgs.get(0), workspace.child(ApplicationConstants.BRIDGE_BINARY_WINDOWS).getRemote()); + if (getOSNameForTest().contains("win")) { + assertEquals( + commandLineArgs.get(0), + workspace.child(ApplicationConstants.BRIDGE_BINARY_WINDOWS).getRemote()); } else { - assertEquals(commandLineArgs.get(0), workspace.child(ApplicationConstants.BRIDGE_BINARY).getRemote()); + assertEquals( + commandLineArgs.get(0), + workspace.child(ApplicationConstants.BRIDGE_BINARY).getRemote()); } assertEquals(commandLineArgs.get(1), BridgeParams.STAGE_OPTION); assertEquals(commandLineArgs.get(2), BridgeParams.BLACKDUCK_STAGE); assertNotEquals(commandLineArgs.get(2), BridgeParams.COVERITY_STAGE); assertNotEquals(commandLineArgs.get(2), BridgeParams.POLARIS_STAGE); assertEquals(commandLineArgs.get(3), BridgeParams.INPUT_OPTION); - assertTrue(Files.exists(Path.of(commandLineArgs.get(4))), - String.format("File %s does not exist at the specified path.", ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX.concat(".json"))); + assertTrue( + Files.exists(Path.of(commandLineArgs.get(4))), + String.format( + "File %s does not exist at the specified path.", + ApplicationConstants.BLACKDUCK_INPUT_JSON_PREFIX.concat(".json"))); assertEquals(commandLineArgs.get(5), BridgeParams.DIAGNOSTICS_OPTION); Utility.removeFile(commandLineArgs.get(4), workspace, listenerMock); @@ -147,18 +166,25 @@ public void getCommandLineArgsForCoverityTest() throws PluginExceptionHandler { List<String> commandLineArgs = scannerArgumentService.getCommandLineArgs(coverityParameters, workspace); - if(getOSNameForTest().contains("win")) { - assertEquals(commandLineArgs.get(0), workspace.child(ApplicationConstants.BRIDGE_BINARY_WINDOWS).getRemote()); + if (getOSNameForTest().contains("win")) { + assertEquals( + commandLineArgs.get(0), + workspace.child(ApplicationConstants.BRIDGE_BINARY_WINDOWS).getRemote()); } else { - assertEquals(commandLineArgs.get(0), workspace.child(ApplicationConstants.BRIDGE_BINARY).getRemote()); + assertEquals( + commandLineArgs.get(0), + workspace.child(ApplicationConstants.BRIDGE_BINARY).getRemote()); } assertEquals(commandLineArgs.get(1), BridgeParams.STAGE_OPTION); assertEquals(commandLineArgs.get(2), BridgeParams.COVERITY_STAGE); assertNotEquals(commandLineArgs.get(2), BridgeParams.POLARIS_STAGE); assertNotEquals(commandLineArgs.get(2), BridgeParams.BLACKDUCK_STAGE); assertEquals(commandLineArgs.get(3), BridgeParams.INPUT_OPTION); - assertTrue(Files.exists(Path.of(commandLineArgs.get(4))), - String.format("File %s does not exist at the specified path.", ApplicationConstants.COVERITY_INPUT_JSON_PREFIX.concat(".json"))); + assertTrue( + Files.exists(Path.of(commandLineArgs.get(4))), + String.format( + "File %s does not exist at the specified path.", + ApplicationConstants.COVERITY_INPUT_JSON_PREFIX.concat(".json"))); assertEquals(commandLineArgs.get(5), BridgeParams.DIAGNOSTICS_OPTION); Utility.removeFile(commandLineArgs.get(4), workspace, listenerMock); @@ -175,18 +201,25 @@ public void getCommandLineArgsForPolarisTest() throws PluginExceptionHandler { List<String> commandLineArgs = scannerArgumentService.getCommandLineArgs(polarisParameters, workspace); - if(getOSNameForTest().contains("win")) { - assertEquals(commandLineArgs.get(0), workspace.child(ApplicationConstants.BRIDGE_BINARY_WINDOWS).getRemote()); + if (getOSNameForTest().contains("win")) { + assertEquals( + commandLineArgs.get(0), + workspace.child(ApplicationConstants.BRIDGE_BINARY_WINDOWS).getRemote()); } else { - assertEquals(commandLineArgs.get(0), workspace.child(ApplicationConstants.BRIDGE_BINARY).getRemote()); + assertEquals( + commandLineArgs.get(0), + workspace.child(ApplicationConstants.BRIDGE_BINARY).getRemote()); } assertEquals(commandLineArgs.get(1), BridgeParams.STAGE_OPTION); assertEquals(commandLineArgs.get(2), BridgeParams.POLARIS_STAGE); assertNotEquals(commandLineArgs.get(2), BridgeParams.COVERITY_STAGE); assertNotEquals(commandLineArgs.get(2), BridgeParams.BLACKDUCK_STAGE); assertEquals(commandLineArgs.get(3), BridgeParams.INPUT_OPTION); - assertTrue(Files.exists(Path.of(commandLineArgs.get(4))), - String.format("File %s does not exist at the specified path.", ApplicationConstants.COVERITY_INPUT_JSON_PREFIX.concat(".json"))); + assertTrue( + Files.exists(Path.of(commandLineArgs.get(4))), + String.format( + "File %s does not exist at the specified path.", + ApplicationConstants.COVERITY_INPUT_JSON_PREFIX.concat(".json"))); Utility.removeFile(commandLineArgs.get(4), workspace, listenerMock); } @@ -218,7 +251,7 @@ public void isFixPrOrPrCommentValueSetTest() { @Test public void removeTemporaryInputJsonTest() { String[] fileNames = {"file1.json", "file2.json"}; - List <String> inputJsonPath = new ArrayList<>(); + List<String> inputJsonPath = new ArrayList<>(); for (String fileName : fileNames) { Path filePath = Paths.get(getHomeDirectoryForTest(), fileName); @@ -237,7 +270,6 @@ public void removeTemporaryInputJsonTest() { for (String path : inputJsonPath) { assertFalse(Files.exists(Paths.get(path))); } - } public String getHomeDirectoryForTest() { diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParameterServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParameterServiceTest.java index b9354e75..2ba06395 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParameterServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParameterServiceTest.java @@ -1,10 +1,11 @@ package io.jenkins.plugins.synopsys.security.scan.service.bridge; import static org.junit.jupiter.api.Assertions.*; -import io.jenkins.plugins.synopsys.security.scan.bridge.BridgeDownloadParameters; -import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; + import hudson.FilePath; import hudson.model.TaskListener; +import io.jenkins.plugins.synopsys.security.scan.bridge.BridgeDownloadParameters; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import java.io.File; import java.io.PrintStream; import java.util.HashMap; @@ -60,8 +61,7 @@ void isValidInstallationPathTest() { if (os.contains("win")) { validPath = String.join("\\", userHome, ApplicationConstants.DEFAULT_DIRECTORY_NAME); invalidPath = String.join("\\", "\\path\\absent", ApplicationConstants.DEFAULT_DIRECTORY_NAME); - } - else if (os.contains("nix") || os.contains("nux") || os.contains("mac")) { + } else if (os.contains("nix") || os.contains("nux") || os.contains("mac")) { validPath = String.join("/", userHome, ApplicationConstants.DEFAULT_DIRECTORY_NAME); invalidPath = String.join("/", "/path/absent", ApplicationConstants.DEFAULT_DIRECTORY_NAME); } @@ -77,10 +77,10 @@ void getBridgeDownloadParamsTest() { scanParams.put(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY, "/path/to/bridge"); scanParams.put(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL, "https://fake.url.com"); - BridgeDownloadParameters - bridgeDownloadParameters = new BridgeDownloadParameters(workspace, listenerMock); - - BridgeDownloadParameters result = bridgeDownloadParametersService.getBridgeDownloadParams(scanParams, bridgeDownloadParameters); + BridgeDownloadParameters bridgeDownloadParameters = new BridgeDownloadParameters(workspace, listenerMock); + + BridgeDownloadParameters result = + bridgeDownloadParametersService.getBridgeDownloadParams(scanParams, bridgeDownloadParameters); assertEquals("https://fake.url.com", result.getBridgeDownloadUrl()); assertEquals("/path/to/bridge", result.getBridgeInstallationPath()); @@ -93,10 +93,10 @@ void getBridgeDownloadParamsWithAirgapEnabledAndVersionTest() { scanParams.put(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY, "/path/to/bridge"); scanParams.put(ApplicationConstants.NETWORK_AIRGAP_KEY, true); - BridgeDownloadParameters - bridgeDownloadParameters = new BridgeDownloadParameters(workspace, listenerMock); + BridgeDownloadParameters bridgeDownloadParameters = new BridgeDownloadParameters(workspace, listenerMock); - BridgeDownloadParameters result = bridgeDownloadParametersService.getBridgeDownloadParams(scanParams, bridgeDownloadParameters); + BridgeDownloadParameters result = + bridgeDownloadParametersService.getBridgeDownloadParams(scanParams, bridgeDownloadParameters); assertFalse(result.getBridgeDownloadUrl().contains(".zip")); assertEquals("/path/to/bridge", result.getBridgeInstallationPath()); @@ -108,10 +108,10 @@ void getBridgeDownloadParamsForAirgapTest() { scanParams.put(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY, "/path/to/bridge"); scanParams.put(ApplicationConstants.NETWORK_AIRGAP_KEY, true); - BridgeDownloadParameters - bridgeDownloadParameters = new BridgeDownloadParameters(workspace, listenerMock); + BridgeDownloadParameters bridgeDownloadParameters = new BridgeDownloadParameters(workspace, listenerMock); - BridgeDownloadParameters result = bridgeDownloadParametersService.getBridgeDownloadParams(scanParams, bridgeDownloadParameters); + BridgeDownloadParameters result = + bridgeDownloadParametersService.getBridgeDownloadParams(scanParams, bridgeDownloadParameters); assertFalse(result.getBridgeDownloadUrl().contains(".zip")); assertEquals("/path/to/bridge", result.getBridgeInstallationPath()); @@ -122,12 +122,13 @@ void getBridgeDownloadParamsForAirgapWithURLTest() { Map<String, Object> scanParams = new HashMap<>(); scanParams.put(ApplicationConstants.NETWORK_AIRGAP_KEY, true); scanParams.put(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY, "/path/to/bridge"); - scanParams.put(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL, "https://bridge.fake.url.com/synopsys-bridge.zip"); + scanParams.put( + ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL, "https://bridge.fake.url.com/synopsys-bridge.zip"); - BridgeDownloadParameters - bridgeDownloadParameters = new BridgeDownloadParameters(workspace, listenerMock); + BridgeDownloadParameters bridgeDownloadParameters = new BridgeDownloadParameters(workspace, listenerMock); - BridgeDownloadParameters result = bridgeDownloadParametersService.getBridgeDownloadParams(scanParams, bridgeDownloadParameters); + BridgeDownloadParameters result = + bridgeDownloadParametersService.getBridgeDownloadParams(scanParams, bridgeDownloadParameters); assertTrue(result.getBridgeDownloadUrl().contains(".zip")); assertEquals("/path/to/bridge", result.getBridgeInstallationPath()); @@ -138,8 +139,9 @@ void getBridgeDownloadParamsNullTest() { Map<String, Object> scanParamsNull = new HashMap<>(); BridgeDownloadParameters bridgeDownloadParameters = new BridgeDownloadParameters(workspace, listenerMock); - - BridgeDownloadParameters result = bridgeDownloadParametersService.getBridgeDownloadParams(scanParamsNull, bridgeDownloadParameters); + + BridgeDownloadParameters result = + bridgeDownloadParametersService.getBridgeDownloadParams(scanParamsNull, bridgeDownloadParameters); assertNotNull(result); assertNotNull(result.getBridgeDownloadUrl()); diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsServiceTest.java index b35d759f..269416f7 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsServiceTest.java @@ -3,13 +3,14 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.*; -import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; + import hudson.EnvVars; import hudson.FilePath; import hudson.Launcher; import hudson.model.Run; import hudson.model.TaskListener; import hudson.tasks.ArtifactArchiver; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -21,14 +22,19 @@ public class DiagnosticsServiceTest { @Mock private Run<?, ?> runMock; + @Mock private TaskListener listenerMock; + @Mock private Launcher launcherMock; + @Mock private EnvVars envVarsMock; + @Mock private ArtifactArchiver artifactArchiverMock; + private DiagnosticsService diagnosticsService; @BeforeEach @@ -36,7 +42,8 @@ public void setUp() { MockitoAnnotations.initMocks(this); when(listenerMock.getLogger()).thenReturn(mock(PrintStream.class)); when(artifactArchiverMock.getArtifacts()).thenReturn(ApplicationConstants.ALL_FILES_WILDCARD_SYMBOL); - diagnosticsService = spy(new DiagnosticsService(runMock, listenerMock, launcherMock, envVarsMock, artifactArchiverMock)); + diagnosticsService = + spy(new DiagnosticsService(runMock, listenerMock, launcherMock, envVarsMock, artifactArchiverMock)); } @Test @@ -47,12 +54,14 @@ public void testArchiveDiagnosticsWhenPathExistsShouldArchiveSuccessfully() { try { diagnosticsPath.mkdirs(); assertTrue(diagnosticsPath.exists()); - - doNothing().when(artifactArchiverMock).perform(eq(runMock), eq(diagnosticsPath), eq(envVarsMock), eq(launcherMock), eq(listenerMock)); + + doNothing() + .when(artifactArchiverMock) + .perform(eq(runMock), eq(diagnosticsPath), eq(envVarsMock), eq(launcherMock), eq(listenerMock)); diagnosticsService.archiveDiagnostics(diagnosticsPath); verify(artifactArchiverMock).perform(runMock, diagnosticsPath, envVarsMock, launcherMock, listenerMock); - + diagnosticsPath.deleteRecursive(); } catch (IOException | InterruptedException e) { System.out.println("Exception occurred during testing for archiveDiagnostics method: " + e.getMessage()); @@ -64,7 +73,7 @@ public void testArchiveDiagnosticsWhenPathDoesNotExistShouldPrintError() { String nonExistingPath = "/path/to/nonexistent"; FilePath diagnosticsPath = new FilePath(new File(nonExistingPath)); - try{ + try { assertFalse(diagnosticsPath.exists()); diagnosticsService.archiveDiagnostics(diagnosticsPath); @@ -74,5 +83,3 @@ public void testArchiveDiagnosticsWhenPathDoesNotExistShouldPrintError() { } } } - - diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersServiceTest.java index f666bd26..92159a1c 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersServiceTest.java @@ -1,7 +1,9 @@ package io.jenkins.plugins.synopsys.security.scan.service.scan; -import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import static org.junit.jupiter.api.Assertions.*; + import hudson.model.TaskListener; +import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import java.io.PrintStream; import java.util.HashMap; import java.util.Map; @@ -9,7 +11,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.jupiter.api.Assertions.*; public class ScanParametersServiceTest { private ScanParametersService scanParametersService; @@ -20,7 +21,7 @@ void setUp() { scanParametersService = new ScanParametersService(listenerMock); Mockito.when(listenerMock.getLogger()).thenReturn(Mockito.mock(PrintStream.class)); } - + @Test void validParametersForBlackDuckTest() { Map<String, Object> parameters = new HashMap<>(); @@ -65,8 +66,10 @@ public void getSynopsysSecurityPlatformsTest() { scanParametersWithMultiplePlatforms.put(ApplicationConstants.PRODUCT_KEY, "blackduck, polaris"); scanParametersWithSinglePlatform.put(ApplicationConstants.PRODUCT_KEY, ""); - Set<String> multiplePlatforms = scanParametersService.getSynopsysSecurityProducts(scanParametersWithMultiplePlatforms); - Set<String> singlePlatform = scanParametersService.getSynopsysSecurityProducts(scanParametersWithSinglePlatform); + Set<String> multiplePlatforms = + scanParametersService.getSynopsysSecurityProducts(scanParametersWithMultiplePlatforms); + Set<String> singlePlatform = + scanParametersService.getSynopsysSecurityProducts(scanParametersWithSinglePlatform); assertEquals(2, multiplePlatforms.size()); assertEquals(1, singlePlatform.size()); diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java index d168d670..7ece311d 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersServiceTest.java @@ -1,9 +1,10 @@ package io.jenkins.plugins.synopsys.security.scan.service.scan.blackduck; import static org.junit.jupiter.api.Assertions.*; + +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.input.blackduck.BlackDuck; -import hudson.model.TaskListener; import java.io.PrintStream; import java.util.HashMap; import java.util.List; @@ -18,7 +19,7 @@ public class BlackDuckParametersServiceTest { private final String TEST_BLACKDUCK_URL = "https://fake.blackduck.url"; private final String TEST_BLACKDUCK_TOKEN = "MDJDSROSVC56FAKEKEY"; private final String TEST_BLACKDUCK_INSTALL_DIRECTORY_PATH = "/path/to/blackduck/directory"; - + @BeforeEach void setUp() { blackDuckParametersService = new BlackDuckParametersService(listenerMock); @@ -31,23 +32,28 @@ void createBlackDuckObjectTest() { blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_URL_KEY, TEST_BLACKDUCK_URL); blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_TOKEN_KEY, TEST_BLACKDUCK_TOKEN); - blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_INSTALL_DIRECTORY_KEY, TEST_BLACKDUCK_INSTALL_DIRECTORY_PATH); + blackDuckParametersMap.put( + ApplicationConstants.BLACKDUCK_INSTALL_DIRECTORY_KEY, TEST_BLACKDUCK_INSTALL_DIRECTORY_PATH); blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_AUTOMATION_FIXPR_KEY, true); blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_AUTOMATION_PRCOMMENT_KEY, false); blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_SCAN_FULL_KEY, true); - blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_SCAN_FAILURE_SEVERITIES_KEY, "BLOCKER, CRITICAL, MAJOR, MINOR"); + blackDuckParametersMap.put( + ApplicationConstants.BLACKDUCK_SCAN_FAILURE_SEVERITIES_KEY, "BLOCKER, CRITICAL, MAJOR, MINOR"); BlackDuck blackDuck = blackDuckParametersService.prepareBlackDuckObjectForBridge(blackDuckParametersMap); assertEquals(TEST_BLACKDUCK_URL, blackDuck.getUrl()); assertEquals(TEST_BLACKDUCK_TOKEN, blackDuck.getToken()); - assertEquals(TEST_BLACKDUCK_INSTALL_DIRECTORY_PATH, blackDuck.getInstall().getDirectory()); + assertEquals( + TEST_BLACKDUCK_INSTALL_DIRECTORY_PATH, blackDuck.getInstall().getDirectory()); assertEquals(true, blackDuck.getAutomation().getFixpr()); assertEquals(false, blackDuck.getAutomation().getPrComment()); assertEquals(true, blackDuck.getScan().getFull()); - assertEquals(List.of("BLOCKER", "CRITICAL", "MAJOR", "MINOR"), blackDuck.getScan().getFailure().getSeverities()); + assertEquals( + List.of("BLOCKER", "CRITICAL", "MAJOR", "MINOR"), + blackDuck.getScan().getFailure().getSeverities()); } @Test @@ -55,7 +61,7 @@ void validateBlackDuckParametersForValidParametersTest() { Map<String, Object> blackDuckParametersMap = new HashMap<>(); blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_URL_KEY, TEST_BLACKDUCK_URL); blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_TOKEN_KEY, TEST_BLACKDUCK_TOKEN); - + assertTrue(blackDuckParametersService.isValidBlackDuckParameters(blackDuckParametersMap)); } @@ -63,7 +69,7 @@ void validateBlackDuckParametersForValidParametersTest() { void validateBlackDuckParametersForMissingParametersTest() { Map<String, Object> blackDuckParametersMap = new HashMap<>(); blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_URL_KEY, TEST_BLACKDUCK_URL); - + assertFalse(blackDuckParametersService.isValidBlackDuckParameters(blackDuckParametersMap)); } @@ -74,8 +80,7 @@ void validateBlackDuckParametersForNullAndEmptyTest() { Map<String, Object> blackDuckParametersMap = new HashMap<>(); blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_URL_KEY, ""); blackDuckParametersMap.put(ApplicationConstants.BLACKDUCK_TOKEN_KEY, TEST_BLACKDUCK_TOKEN); - + assertFalse(blackDuckParametersService.isValidBlackDuckParameters(blackDuckParametersMap)); } - -} \ No newline at end of file +} diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersServiceTest.java index b0be4a67..c0d1ab95 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersServiceTest.java @@ -3,9 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; + +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.input.coverity.Coverity; -import hudson.model.TaskListener; import java.io.PrintStream; import java.util.HashMap; import java.util.Map; @@ -25,16 +26,16 @@ void setUp() { coverityParametersService = new CoverityParametersService(listenerMock); Mockito.when(listenerMock.getLogger()).thenReturn(Mockito.mock(PrintStream.class)); } - + @Test void invalidScanParametersTest() { Map<String, Object> coverityParameters = new HashMap<>(); - + assertFalse(coverityParametersService.isValidCoverityParameters(coverityParameters)); - + coverityParameters.put(ApplicationConstants.COVERITY_URL_KEY, TEST_COVERITY_URL); coverityParameters.put(ApplicationConstants.COVERITY_USER_KEY, TEST_COVERITY_USER_NAME); - + assertFalse(coverityParametersService.isValidCoverityParameters(coverityParameters)); } @@ -62,7 +63,7 @@ void prepareScanInputForBridgeTest() { coverityParameters.put(ApplicationConstants.COVERITY_LOCAL_KEY, true); Coverity coverity = coverityParametersService.prepareCoverityObjectForBridge(coverityParameters); - + assertEquals(coverity.getConnect().getUrl(), TEST_COVERITY_URL); assertEquals(coverity.getConnect().getUser().getName(), TEST_COVERITY_USER_NAME); assertEquals(coverity.getConnect().getUser().getPassword(), TEST_COVERITY_USER_PASSWORD); diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersServiceTest.java index 38124944..a781e0fb 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersServiceTest.java @@ -1,9 +1,10 @@ package io.jenkins.plugins.synopsys.security.scan.service.scan.polaris; import static org.junit.jupiter.api.Assertions.*; + +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; import io.jenkins.plugins.synopsys.security.scan.input.polaris.Polaris; -import hudson.model.TaskListener; import java.io.PrintStream; import java.util.Arrays; import java.util.HashMap; @@ -29,7 +30,7 @@ void setUp() { @Test void invalidScanParametersTest() { Map<String, Object> polarisParameters = new HashMap<>(); - + assertFalse(polarisParametersService.isValidPolarisParameters(polarisParameters)); polarisParameters.put(ApplicationConstants.POLARIS_SERVER_URL_KEY, TEST_POLARIS_SERVER_URL); @@ -62,10 +63,11 @@ void prepareScanInputForBridgeTest() { polarisParameters.put(ApplicationConstants.POLARIS_ASSESSMENT_TYPES_KEY, "SAST"); polarisParameters.put(ApplicationConstants.POLARIS_TRIAGE_KEY, "REQUIRED"); polarisParameters.put(ApplicationConstants.POLARIS_BRANCH_NAME_KEY, "test-branch"); -// polarisParameters.put(ApplicationConstants.BRIDGE_POLARIS_BRANCH_PARENT_NAME_KEY, "test-parent-branch"); + // polarisParameters.put(ApplicationConstants.BRIDGE_POLARIS_BRANCH_PARENT_NAME_KEY, + // "test-parent-branch"); Polaris polaris = polarisParametersService.preparePolarisObjectForBridge(polarisParameters); - + assertEquals(polaris.getServerUrl(), TEST_POLARIS_SERVER_URL); assertEquals(polaris.getAccessToken(), TEST_POLARIS_ACCESS_TOKEN); assertEquals(polaris.getApplicationName().getName(), TEST_APPLICATION_NAME); @@ -73,6 +75,6 @@ void prepareScanInputForBridgeTest() { assertEquals(polaris.getAssessmentTypes().getTypes(), Arrays.asList("SAST")); assertEquals(polaris.getTriage(), "REQUIRED"); assertEquals(polaris.getBranch().getName(), "test-branch"); -// assertEquals(polaris.getBranch().getParent().getName(), "test-parent-branch"); + // assertEquals(polaris.getBranch().getParent().getName(), "test-parent-branch"); } } diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryServiceTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryServiceTest.java index a164678a..2844dfb3 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryServiceTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryServiceTest.java @@ -4,25 +4,27 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; + import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource; import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketApi; import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository; +import hudson.model.TaskListener; import io.jenkins.plugins.synopsys.security.scan.exception.PluginExceptionHandler; import io.jenkins.plugins.synopsys.security.scan.global.ApplicationConstants; +import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Bitbucket; import java.io.IOException; import java.io.PrintStream; import java.util.HashMap; import java.util.Map; -import hudson.model.TaskListener; -import io.jenkins.plugins.synopsys.security.scan.input.bitbucket.Bitbucket; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; public class BitbucketRepositoryServiceTest { - private final BitbucketRepositoryService bitbucketRepositoryServiceMock = Mockito.mock(BitbucketRepositoryService.class); + private final BitbucketRepositoryService bitbucketRepositoryServiceMock = + Mockito.mock(BitbucketRepositoryService.class); private final String TEST_BITBUCKET_URL = "https://fake.bitbucket.url"; - private final String TEST_BITBUCKET_TOKEN = "MSDFSGOIIEGWGWEGFAKEKEY" ; + private final String TEST_BITBUCKET_TOKEN = "MSDFSGOIIEGWGWEGFAKEKEY"; private final Integer TEST_REPOSITORY_PULL_NUMBER = 7; private final String TEST_REPOSITORY_NAME = "TEST_REPO"; private final String TEST_PROJECT_KEY = "my_key"; @@ -32,15 +34,20 @@ public class BitbucketRepositoryServiceTest { @BeforeEach void setUp() throws PluginExceptionHandler { - Bitbucket bitbucket = BitbucketRepositoryService.createBitbucketObject(TEST_BITBUCKET_URL, TEST_BITBUCKET_TOKEN, TEST_REPOSITORY_PULL_NUMBER, TEST_REPOSITORY_NAME, TEST_PROJECT_KEY); + Bitbucket bitbucket = BitbucketRepositoryService.createBitbucketObject( + TEST_BITBUCKET_URL, + TEST_BITBUCKET_TOKEN, + TEST_REPOSITORY_PULL_NUMBER, + TEST_REPOSITORY_NAME, + TEST_PROJECT_KEY); bitbucketParametersMap.put(ApplicationConstants.BITBUCKET_TOKEN_KEY, TEST_BITBUCKET_TOKEN); bitbucketSCMSourceMock = mock(BitbucketSCMSource.class); - when(bitbucketRepositoryServiceMock - .fetchBitbucketRepositoryDetails(bitbucketParametersMap, bitbucketSCMSourceMock, TEST_REPOSITORY_PULL_NUMBER, false)) - .thenReturn(bitbucket); + when(bitbucketRepositoryServiceMock.fetchBitbucketRepositoryDetails( + bitbucketParametersMap, bitbucketSCMSourceMock, TEST_REPOSITORY_PULL_NUMBER, false)) + .thenReturn(bitbucket); listenerMock = Mockito.mock(TaskListener.class); Mockito.when(listenerMock.getLogger()).thenReturn(Mockito.mock(PrintStream.class)); @@ -48,13 +55,16 @@ void setUp() throws PluginExceptionHandler { @Test void createBitbucketObjectTest() throws PluginExceptionHandler { - Bitbucket bitbucket = bitbucketRepositoryServiceMock. - fetchBitbucketRepositoryDetails(bitbucketParametersMap, bitbucketSCMSourceMock, TEST_REPOSITORY_PULL_NUMBER, false); + Bitbucket bitbucket = bitbucketRepositoryServiceMock.fetchBitbucketRepositoryDetails( + bitbucketParametersMap, bitbucketSCMSourceMock, TEST_REPOSITORY_PULL_NUMBER, false); assertEquals(TEST_BITBUCKET_URL, bitbucket.getApi().getUrl()); assertEquals(TEST_BITBUCKET_TOKEN, bitbucket.getApi().getToken()); - assertEquals(TEST_REPOSITORY_PULL_NUMBER, bitbucket.getProject().getRepository().getPull().getNumber()); - assertEquals(TEST_REPOSITORY_NAME, bitbucket.getProject().getRepository().getName()); + assertEquals( + TEST_REPOSITORY_PULL_NUMBER, + bitbucket.getProject().getRepository().getPull().getNumber()); + assertEquals( + TEST_REPOSITORY_NAME, bitbucket.getProject().getRepository().getName()); assertEquals(TEST_PROJECT_KEY, bitbucket.getProject().getKey()); } @@ -70,14 +80,16 @@ public void fetchBitbucketRepositoryDetailsTest() throws PluginExceptionHandler, when(bitbucketApiFromSCMSource.getRepository()).thenReturn(bitbucketRepository); BitbucketRepositoryService bitbucketRepositoryService = new BitbucketRepositoryService(listenerMock); - Bitbucket result = bitbucketRepositoryService.fetchBitbucketRepositoryDetails(scanParameters, bitbucketSCMSource, - 1, true); + Bitbucket result = + bitbucketRepositoryService.fetchBitbucketRepositoryDetails(scanParameters, bitbucketSCMSource, 1, true); assertNotNull(result); scanParameters.clear(); scanParameters.put(ApplicationConstants.BITBUCKET_TOKEN_KEY, ""); - assertThrows(PluginExceptionHandler.class, () -> bitbucketRepositoryService.fetchBitbucketRepositoryDetails(scanParameters, bitbucketSCMSource, - 1, true)); + assertThrows( + PluginExceptionHandler.class, + () -> bitbucketRepositoryService.fetchBitbucketRepositoryDetails( + scanParameters, bitbucketSCMSource, 1, true)); } } From fc9d7b0e353afd124b620048e572dbfdbcd3f5f1 Mon Sep 17 00:00:00 2001 From: jraihan <jahid.raihan@dsinnovators.com> Date: Mon, 16 Oct 2023 18:22:16 +0600 Subject: [PATCH 3/4] removed header comment from each class. --- .../synopsys/security/scan/PluginParametersHandler.java | 7 ------- .../plugins/synopsys/security/scan/SecurityScanner.java | 7 ------- .../synopsys/security/scan/bridge/BridgeDownload.java | 7 ------- .../security/scan/bridge/BridgeDownloadManager.java | 7 ------- .../security/scan/bridge/BridgeDownloadParameters.java | 7 ------- .../synopsys/security/scan/bridge/BridgeInstall.java | 7 ------- .../security/scan/exception/PluginExceptionHandler.java | 7 ------- .../synopsys/security/scan/exception/ScannerException.java | 7 ------- .../scan/extension/global/ScannerGlobalConfig.java | 7 ------- .../security/scan/extension/pipeline/SecurityScanStep.java | 7 ------- .../security/scan/factory/ScanParametersFactory.java | 7 ------- .../security/scan/global/ApplicationConstants.java | 7 ------- .../synopsys/security/scan/global/BridgeParams.java | 7 ------- .../synopsys/security/scan/global/ExceptionMessages.java | 7 ------- .../synopsys/security/scan/global/HomeDirectoryTask.java | 7 ------- .../plugins/synopsys/security/scan/global/LogMessages.java | 7 ------- .../synopsys/security/scan/global/LoggerWrapper.java | 7 ------- .../plugins/synopsys/security/scan/global/OsNameTask.java | 7 ------- .../plugins/synopsys/security/scan/global/Utility.java | 7 ------- .../security/scan/global/enums/SecurityProduct.java | 7 ------- .../plugins/synopsys/security/scan/input/BridgeInput.java | 7 ------- .../synopsys/security/scan/input/NetworkAirGap.java | 7 ------- .../synopsys/security/scan/input/bitbucket/Api.java | 7 ------- .../synopsys/security/scan/input/bitbucket/Bitbucket.java | 7 ------- .../synopsys/security/scan/input/bitbucket/Project.java | 7 ------- .../synopsys/security/scan/input/bitbucket/Pull.java | 7 ------- .../synopsys/security/scan/input/bitbucket/Repository.java | 7 ------- .../synopsys/security/scan/input/blackduck/Automation.java | 7 ------- .../synopsys/security/scan/input/blackduck/BlackDuck.java | 7 ------- .../synopsys/security/scan/input/blackduck/Download.java | 7 ------- .../synopsys/security/scan/input/blackduck/Failure.java | 7 ------- .../synopsys/security/scan/input/blackduck/Install.java | 7 ------- .../synopsys/security/scan/input/blackduck/Scan.java | 7 ------- .../synopsys/security/scan/input/coverity/Automation.java | 7 ------- .../synopsys/security/scan/input/coverity/Connect.java | 7 ------- .../synopsys/security/scan/input/coverity/Coverity.java | 7 ------- .../synopsys/security/scan/input/coverity/Policy.java | 7 ------- .../synopsys/security/scan/input/coverity/Project.java | 7 ------- .../synopsys/security/scan/input/coverity/Stream.java | 7 ------- .../synopsys/security/scan/input/coverity/User.java | 7 ------- .../security/scan/input/polaris/ApplicationName.java | 7 ------- .../security/scan/input/polaris/AssessmentTypes.java | 7 ------- .../synopsys/security/scan/input/polaris/Branch.java | 7 ------- .../synopsys/security/scan/input/polaris/Polaris.java | 7 ------- .../synopsys/security/scan/input/polaris/ProjectName.java | 7 ------- .../security/scan/service/ScannerArgumentService.java | 7 ------- .../service/bridge/BridgeDownloadParametersService.java | 7 ------- .../scan/service/diagnostics/DiagnosticsService.java | 7 ------- .../security/scan/service/scan/ScanParametersService.java | 7 ------- .../service/scan/blackduck/BlackDuckParametersService.java | 7 ------- .../service/scan/coverity/CoverityParametersService.java | 7 ------- .../service/scan/polaris/PolarisParametersService.java | 7 ------- .../scan/service/scm/BitbucketRepositoryService.java | 7 ------- .../security/scan/service/scm/SCMRepositoryService.java | 7 ------- 54 files changed, 378 deletions(-) diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java index 07a34e80..297456ef 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/PluginParametersHandler.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan; import hudson.EnvVars; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java index fd91021c..9786dcf9 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/SecurityScanner.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan; import hudson.EnvVars; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java index b4c25034..4c5eb95f 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownload.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.bridge; import hudson.EnvVars; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java index e0cf9bd8..96f4d79b 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadManager.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.bridge; import hudson.EnvVars; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java index 37634618..e4522f1b 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeDownloadParameters.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.bridge; import hudson.FilePath; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java index 78cf7648..8ed3c272 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/bridge/BridgeInstall.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.bridge; import hudson.FilePath; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/PluginExceptionHandler.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/PluginExceptionHandler.java index ed370c7e..5e1b0c2d 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/PluginExceptionHandler.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/PluginExceptionHandler.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.exception; public class PluginExceptionHandler extends Exception { diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/ScannerException.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/ScannerException.java index 6dbfb73b..c9b74713 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/ScannerException.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/exception/ScannerException.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.exception; public class ScannerException extends Exception { diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java index f23fbb39..514eda42 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/global/ScannerGlobalConfig.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.extension.global; import hudson.Extension; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java index 5b2463c6..a2fed957 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.extension.pipeline; import hudson.*; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java index 70403b8d..1fb27aee 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/factory/ScanParametersFactory.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.factory; import hudson.AbortException; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java index 84d5a655..357914eb 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ApplicationConstants.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.global; public class ApplicationConstants { diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java index b746bba0..8c4dca57 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/BridgeParams.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.global; public class BridgeParams { diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ExceptionMessages.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ExceptionMessages.java index 8aef93d6..0cb149c2 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ExceptionMessages.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/ExceptionMessages.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.global; import java.util.HashMap; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java index 8f67d6ae..681a50d6 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/HomeDirectoryTask.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.global; import hudson.remoting.VirtualChannel; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java index f0574334..19af5572 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LogMessages.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.global; public class LogMessages { diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java index eca259ca..a4145ef7 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/LoggerWrapper.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.global; import hudson.model.TaskListener; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java index 77195f08..f84f8911 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/OsNameTask.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.global; import hudson.FilePath; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java index de92b371..b92a3ee1 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/Utility.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.global; import hudson.EnvVars; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/enums/SecurityProduct.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/enums/SecurityProduct.java index b6be1f17..d5c93968 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/enums/SecurityProduct.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/global/enums/SecurityProduct.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.global.enums; public enum SecurityProduct { diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/BridgeInput.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/BridgeInput.java index 8a79a17d..d8216685 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/BridgeInput.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/BridgeInput.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/NetworkAirGap.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/NetworkAirGap.java index 128cf2b5..aaa8842c 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/NetworkAirGap.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/NetworkAirGap.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Api.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Api.java index afe26d09..ad2ad9f1 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Api.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Api.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.bitbucket; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Bitbucket.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Bitbucket.java index d7d519b3..5e3b1be7 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Bitbucket.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Bitbucket.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.bitbucket; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Project.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Project.java index d322775d..7bfcbbe4 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Project.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Project.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.bitbucket; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Pull.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Pull.java index 1fcd867f..57ff7b8e 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Pull.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Pull.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.bitbucket; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Repository.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Repository.java index 12e4e97b..1c9352c8 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Repository.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/bitbucket/Repository.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.bitbucket; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java index 22cbc2bb..33f8d445 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Automation.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/BlackDuck.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/BlackDuck.java index f8ebf859..0d21231f 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/BlackDuck.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/BlackDuck.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Download.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Download.java index 4dd88d82..b8a53a49 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Download.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Download.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Failure.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Failure.java index 03e2218c..5f9015af 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Failure.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Failure.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Install.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Install.java index 28cd84af..a6dc8084 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Install.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Install.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java index 8c0c1c90..31777124 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/blackduck/Scan.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.blackduck; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Automation.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Automation.java index 56a130c0..b17fd579 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Automation.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Automation.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java index d06d56b2..6ecd35d9 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Connect.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java index 359722f2..b7d7b623 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Coverity.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Policy.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Policy.java index 3b03c2c4..275edec9 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Policy.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Policy.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Project.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Project.java index 5ecb661c..705869f9 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Project.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Project.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Stream.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Stream.java index c53ae991..9bb68d98 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Stream.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/Stream.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/User.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/User.java index ef250ce5..71df9d34 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/User.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/coverity/User.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.coverity; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java index 7d7aa891..50dc13d8 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ApplicationName.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.polaris; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/AssessmentTypes.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/AssessmentTypes.java index 27775d8f..76a452ae 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/AssessmentTypes.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/AssessmentTypes.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.polaris; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java index ab7739d4..117e79c7 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Branch.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.polaris; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Polaris.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Polaris.java index d1b15a96..bc59d685 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Polaris.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/Polaris.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.polaris; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ProjectName.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ProjectName.java index 07f5bc11..b37711c4 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ProjectName.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/input/polaris/ProjectName.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.input.polaris; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java index 18e13a8e..220b8f4b 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/ScannerArgumentService.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.service; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java index f576ce02..153d9301 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/bridge/BridgeDownloadParametersService.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.service.bridge; import hudson.FilePath; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java index afbc3d32..043afdd7 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/diagnostics/DiagnosticsService.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.service.diagnostics; import hudson.EnvVars; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java index 6752782e..d8e246eb 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/ScanParametersService.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.service.scan; import hudson.model.TaskListener; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java index 0ac5b9b4..148721cc 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/blackduck/BlackDuckParametersService.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.service.scan.blackduck; import hudson.model.TaskListener; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java index bdfcbe14..49f554c3 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.service.scan.coverity; import hudson.model.TaskListener; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java index 071a9d60..72508c6a 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.service.scan.polaris; import hudson.model.TaskListener; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java index 42b86f1c..60a86968 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/BitbucketRepositoryService.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.service.scm; import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource; diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java index 480c3c05..652134a8 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/service/scm/SCMRepositoryService.java @@ -1,10 +1,3 @@ -/* - * synopsys-security-scan-plugin - * - * Copyright (c) 2023 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ package io.jenkins.plugins.synopsys.security.scan.service.scm; import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource; From 0f13d31b0e45805791490e91fa6a6f907d6c32bc Mon Sep 17 00:00:00 2001 From: jraihan <jahid.raihan@dsinnovators.com> Date: Tue, 17 Oct 2023 13:10:36 +0600 Subject: [PATCH 4/4] applied maven spotless after merging with main. --- pom.xml | 50 +++++++++---------- .../extension/pipeline/SecurityScanStep.java | 10 ++-- .../security/scan/global/UtilityTest.java | 4 +- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 41bf8d24..3dd5578f 100644 --- a/pom.xml +++ b/pom.xml @@ -63,14 +63,6 @@ </dependencyManagement> <dependencies> - <dependency> - <groupId>org.jenkins-ci.plugins</groupId> - <artifactId>structs</artifactId> - </dependency> - <dependency> - <groupId>org.jenkins-ci.plugins.workflow</groupId> - <artifactId>workflow-step-api</artifactId> - </dependency> <dependency> <groupId>org.jenkins-ci.plugins</groupId> <artifactId>cloudbees-bitbucket-branch-source</artifactId> @@ -81,6 +73,14 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.jenkins-ci.plugins</groupId> + <artifactId>structs</artifactId> + </dependency> + <dependency> + <groupId>org.jenkins-ci.plugins.workflow</groupId> + <artifactId>workflow-step-api</artifactId> + </dependency> <dependency> <groupId>org.jenkins-ci.plugins.workflow</groupId> <artifactId>workflow-basic-steps</artifactId> @@ -118,6 +118,23 @@ </dependency> </dependencies> + <repositories> + <repository> + <id>repo.jenkins-ci.org</id> + <url>https://repo.jenkins-ci.org/public/</url> + </repository> + <repository> + <id>bds-artifactory</id> + <url>${repoReleaseArtifactoryUrl}</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>repo.jenkins-ci.org</id> + <url>https://repo.jenkins-ci.org/public/</url> + </pluginRepository> + </pluginRepositories> + <profiles> <profile> <id>snapshot-deployment</id> @@ -160,21 +177,4 @@ </distributionManagement> </profile> </profiles> - - <repositories> - <repository> - <id>repo.jenkins-ci.org</id> - <url>https://repo.jenkins-ci.org/public/</url> - </repository> - <repository> - <id>bds-artifactory</id> - <url>${repoReleaseArtifactoryUrl}</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>repo.jenkins-ci.org</id> - <url>https://repo.jenkins-ci.org/public/</url> - </pluginRepository> - </pluginRepositories> </project> diff --git a/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java index f1b8430f..82dd1feb 100644 --- a/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java +++ b/src/main/java/io/jenkins/plugins/synopsys/security/scan/extension/pipeline/SecurityScanStep.java @@ -1,5 +1,6 @@ package io.jenkins.plugins.synopsys.security.scan.extension.pipeline; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.*; import hudson.model.Node; import hudson.model.Run; @@ -13,7 +14,6 @@ import io.jenkins.plugins.synopsys.security.scan.global.ExceptionMessages; import io.jenkins.plugins.synopsys.security.scan.global.LoggerWrapper; import io.jenkins.plugins.synopsys.security.scan.global.enums.SecurityProduct; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.Serializable; import java.util.*; @@ -406,10 +406,13 @@ public class Execution extends SynchronousNonBlockingStepExecution<Integer> { private final transient Run<?, ?> run; private final transient Launcher launcher; private final transient Node node; + @SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED") private final transient TaskListener listener; + @SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED") private final transient EnvVars envVars; + @SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED") private final transient FilePath workspace; @@ -432,9 +435,8 @@ protected Integer run() throws PluginExceptionHandler, ScannerException { "**************************** START EXECUTION OF SYNOPSYS SECURITY SCAN ****************************"); try { - result = ScanParametersFactory - .createPipelineCommand(run, listener, envVars, launcher, node, workspace) - .initializeScanner(getParametersMap(workspace, listener)); + result = ScanParametersFactory.createPipelineCommand(run, listener, envVars, launcher, node, workspace) + .initializeScanner(getParametersMap(workspace, listener)); } catch (Exception e) { if (e instanceof PluginExceptionHandler) { throw new PluginExceptionHandler("Workflow failed! " + e.getMessage()); diff --git a/src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java b/src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java index 337b8a46..d7173bbe 100644 --- a/src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java +++ b/src/test/java/io/jenkins/plugins/synopsys/security/scan/global/UtilityTest.java @@ -152,8 +152,8 @@ public void setDefaultProxyAuthenticatorTest() { assertEquals("username", passwordAuth.getUserName()); assertArrayEquals("password".toCharArray(), passwordAuth.getPassword()); - - Utility.setDefaultProxyAuthenticator(passwordAuth.getUserName().concat(":").concat(Arrays.toString(passwordAuth.getPassword()))); + Utility.setDefaultProxyAuthenticator( + passwordAuth.getUserName().concat(":").concat(Arrays.toString(passwordAuth.getPassword()))); Authenticator authenticator = Authenticator.getDefault(); assertNotNull(authenticator);