Skip to content

fix(scass uploader): Add proxy info to upload client (IDETECT-4921) #1611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
shantyk wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix(scass uploader): Add proxy info to upload client (IDETECT-4921) #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ dependencies {

implementation 'com.blackducksoftware.bdio:bdio-protobuf:3.2.12'
implementation "com.blackduck.integration:blackduck-common:${blackDuckCommonVersion}"
implementation 'com.blackduck.integration:blackduck-upload-common:4.1.2'
implementation 'com.blackduck.integration:blackduck-upload-common:4.1.4'
implementation 'com.blackducksoftware:method-analyzer-core:1.0.1'
implementation "${locatorGroup}:${locatorModule}:2.1.1"

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/blackduck/integration/detect/lifecycle/run/step/ScassScanStepRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void runScassScan(Optional<File> scanFileOptional, ScanCreationResponse s
throw new IntegrationException("Scan creation response is not provided.");
}

ScassUploader scaasScanUploader = createScaasScanUploader();
ScassUploader scaasScanUploader = createScaasScanUploaderWithProxyInfo();

// Don't upload a file larger than SCASS's capability indicates
validateGcpSize(scanFileOptional, scanCreationResponse);
Expand Down Expand Up @@ -79,11 +79,11 @@ private void validateGcpSize(Optional<File> scanFile, ScanCreationResponse scanC
}
}
}
private ScassUploader createScaasScanUploader() throws IntegrationException {

private ScassUploader createScaasScanUploaderWithProxyInfo() throws IntegrationException {
UploaderFactory uploadFactory = UploaderHelper.getUploaderFactory(blackDuckRunData);
return uploadFactory.createScassUploader();

return uploadFactory.createScassUploaderWithProxyInfo();
}

private Response notifyUploadComplete(String scanId) throws IntegrationException {
Expand Down