Skip to content

Commit 2aee9fe

Browse files
authored
Merge pull request #14 from blackduck-inc/SIGINT-2425
SIGINT-2425: bridge binary renamed and SIGINT-2439: Handle bridge cli bundle sub directory for bidge cli execution
2 parents 22d7d70 + 613232f commit 2aee9fe

21 files changed

+2086
-1878
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ To use Black Duck Security Scan, please follow the steps below:
88
1. Configure Azure DevOps as described in the [Azure Prerequisites](https://sig-product-docs.synopsys.com/bundle/bridge/page/documentation/c_azure-prerequisites.html) page.
99
2. Install and configure Black Duck Security Scan for the Black Duck product you are using. <br/>
1010
[Polaris](https://sig-product-docs.synopsys.com/bundle/bridge/page/documentation/c_azure-with-polaris.html) <br/>
11-
[Black Duck](https://sig-product-docs.synopsys.com/bundle/bridge/page/documentation/c_azure-with-blackduck.html) <br/>
11+
[Black Duck SCA](https://sig-product-docs.synopsys.com/bundle/bridge/page/documentation/c_azure-with-blackduck.html) <br/>
1212
[Coverity](https://sig-product-docs.synopsys.com/bundle/bridge/page/documentation/c_azure-with-coverity.html) <br/>
1313
3. For additional configuration options, visit the [Additional Azure Configuration](https://sig-product-docs.synopsys.com/bundle/bridge/page/documentation/c_additional-azure-parameters.html) page.
1414

blackduck-security-task/dist/index.js

+1,446-1,389
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

blackduck-security-task/dist/index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+13-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
{
2-
"messages": {
3-
"TOOL_LIB_CachingTool": "Caching tool: %s %s %s",
4-
"_TOOL_LIB_CachingTool.comment": "This informational log message indicates that a tool, that was just downloaded, is being copied into the cache directory. %s %s %s represent the tool name, version information, and processor architecture.",
5-
"TOOL_LIB_Downloading": "Downloading: %s",
6-
"_TOOL_LIB_Downloading.comment": "This information log message indicates that a file is being downloaded. %s represents the URL being downloaded.",
7-
"TOOL_LIB_ExtractingArchive": "Extracting archive",
8-
"_TOOL_LIB_ExtractingArchive.comment": "This informational log message indicates that an archive file is being extracted. For example, a .zip file, .7z file, or .tar.gz file.",
9-
"TOOL_LIB_FoundInCache": "Found tool in cache: %s %s %s",
10-
"_TOOL_LIB_FoundInCache.comment": "This informational log message indicates that the request tool is already cached, and does not need to be downloaded again. %s %s %s represent the tool name, version information, and processor architecture.",
11-
"TOOL_LIB_PrependPath": "Prepending PATH environment variable with directory: %s",
12-
"_TOOL_LIB_PrependPath.comment": "This informational log message indicates that a directory is being prepended to the front of the PATH environment variable. The directories specified by the PATH environment variable are used to resolve the location of command line tools."
13-
}
1+
{
2+
"messages": {
3+
"TOOL_LIB_CachingTool": "Caching tool: %s %s %s",
4+
"_TOOL_LIB_CachingTool.comment": "This informational log message indicates that a tool, that was just downloaded, is being copied into the cache directory. %s %s %s represent the tool name, version information, and processor architecture.",
5+
"TOOL_LIB_Downloading": "Downloading: %s",
6+
"_TOOL_LIB_Downloading.comment": "This information log message indicates that a file is being downloaded. %s represents the URL being downloaded.",
7+
"TOOL_LIB_ExtractingArchive": "Extracting archive",
8+
"_TOOL_LIB_ExtractingArchive.comment": "This informational log message indicates that an archive file is being extracted. For example, a .zip file, .7z file, or .tar.gz file.",
9+
"TOOL_LIB_FoundInCache": "Found tool in cache: %s %s %s",
10+
"_TOOL_LIB_FoundInCache.comment": "This informational log message indicates that the request tool is already cached, and does not need to be downloaded again. %s %s %s represent the tool name, version information, and processor architecture.",
11+
"TOOL_LIB_PrependPath": "Prepending PATH environment variable with directory: %s",
12+
"_TOOL_LIB_PrependPath.comment": "This informational log message indicates that a directory is being prepended to the front of the PATH environment variable. The directories specified by the PATH environment variable are used to resolve the location of command line tools."
13+
}
1414
}

blackduck-security-task/icon.png

17.2 KB
Loading

blackduck-security-task/src/blackduck-security-task/application-constant.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
// Copyright (c) 2024 Black Duck Software Inc. All rights reserved worldwide.
22

33
import { ErrorCode } from "./enum/ErrorCodes";
4-
export const BRIDGE_CLI_DEFAULT_PATH_MAC = "/bridge-cli"; //Path will be in home
5-
export const BRIDGE_CLI_DEFAULT_PATH_WINDOWS = "\\bridge-cli";
6-
export const BRIDGE_CLI_DEFAULT_PATH_LINUX = "/bridge-cli";
4+
export const BRIDGE_CLI_DEFAULT_PATH_UNIX = "/bridge-cli-bundle"; //Path will be in home
5+
export const BRIDGE_CLI_DEFAULT_PATH_WINDOWS = "\\bridge-cli-bundle";
6+
export const BRIDGE_CLI_DEFAULT_SUBDIRECTORY_PATH_UNIX = "/bridge-cli-bundle"; //Subdirectory for bridle-cli
7+
export const BRIDGE_CLI_DEFAULT_SUBDIRECTORY_PATH_WINDOWS =
8+
"\\bridge-cli-bundle";
79
export const BRIDGE_CLI_EXECUTABLE_WINDOWS = "bridge-cli.exe";
810
export const BRIDGE_CLI_EXECUTABLE_MAC_LINUX = "bridge-cli";
9-
export const BRIDGE_CLI_ZIP_FILE_NAME = "bridge-cli.zip";
11+
export const BRIDGE_CLI_ZIP_FILE_NAME = "bridge-cli-bundle.zip";
1012

11-
export const APPLICATION_NAME = "blackduck-extension";
1213
export const AZURE_TOKEN_KEY = "azure_token";
1314
export const POLARIS_AZURE_TOKEN_KEY_CLASSIC_EDITOR = "polarisAzureToken";
1415
export const BLACKDUCKSCA_AZURE_TOKEN_KEY_CLASSIC_EDITOR =
@@ -442,6 +443,9 @@ export const WINDOWS_PLATFORM = "win64";
442443
export const LINUX_PLATFORM = "linux64";
443444
export const MAC_ARM_PLATFORM = "macos_arm";
444445
export const MAC_INTEL_PLATFORM = "macosx";
446+
export const WIN32 = "win32";
447+
export const LINUX = "linux";
448+
export const DARWIN = "darwin";
445449
export const MIN_SUPPORTED_BRIDGE_CLI_MAC_ARM_VERSION = "2.1.0";
446450
export const DEFAULT_AZURE_API_URL = "https://dev.azure.com";
447451
export const BLACKDUCKSCA_SECURITY_SCAN_AZURE_DEVOPS_DOCS_URL =

0 commit comments

Comments
 (0)