Proxy fixes. Embedded script update. Bump to 1.0.4

Author: BDS-AD\jpiscitelli

tasks/detect-task/detect-task.ps1

@@ -8,7 +8,7 @@ Import-Module $PSScriptRoot\lib\argument-parser.ps1
 
 ######################SETTINGS#######################
 
-$TaskVersion = "1.0.3"; #Automatically Updated
+$TaskVersion = "1.0.4"; #Automatically Updated
 Write-Host ("Detect for TFS Version {0}" -f $TaskVersion)
 
 #Support all TLS protocols. 
@@ -33,11 +33,19 @@ $HubPassword = $ServiceEndpoint.auth.parameters.password
 
 #Get Proxy Information 
 
-$Service = (Get-VstsInput -Name BlackDuckHubService -Require)
-$ServiceEndpoint = Get-VstsEndpoint -Name $Service
-$HubUrl = $ServiceEndpoint.Url
-$HubUsername = $ServiceEndpoint.auth.parameters.username
-$HubPassword = $ServiceEndpoint.auth.parameters.password
+$ProxyService = (Get-VstsInput -Name BlackDuckHubProxyService -Default "")
+$UseProxy = $false;
+if ([string]::IsNullOrEmpty($ProxyService)){
+    Write-Host ("No proxy service selected.");
+}else{
+    Write-Host ("Found proxy service.");
+    $UseProxy = $true;
+    $ProxyServiceEndpoint = Get-VstsEndpoint -Name $ProxyService
+    $ProxyUrl = $ProxyServiceEndpoint.Url
+    $ProxyServiceEndpoint.Url | Get-Member
+    $ProxyUsername = $ProxyServiceEndpoint.auth.parameters.username
+    $ProxyPassword = $ProxyServiceEndpoint.auth.parameters.password
+}
 
 #Get Other Input
 
@@ -66,6 +74,18 @@ ${Env:blackduck.hub.username} = $HubUsername
 ${Env:blackduck.hub.password} = $HubPassword
 ${Env:detect.phone.home.passthrough.detect.for.tfs.version} = $TaskVersion
 
+if ($UseProxy -eq $true){
+    $ProxyUri = [System.Uri] $ProxyUrl
+    $ProxyHost = ("{0}://{1}" -f $ProxyUri.Scheme, $ProxyUri.Host)
+    $ProxyPort = $ProxyUri.Port
+    Write-Host ("Parsed Proxy Host: {0}" -f $ProxyHost)
+    Write-Host ("Parsed Proxy Port: {0}" -f $ProxyPort)
+    ${Env:blackduck.hub.proxy.host} = $ProxyHost
+    ${Env:blackduck.hub.proxy.port} = $ProxyPort
+    ${Env:blackduck.hub.proxy.password} = $ProxyUsername
+    ${Env:blackduck.hub.proxy.username} = $ProxyPassword
+}
+
 #Ask our lib to parse the string into arguments
 Write-Host "Parsing additional arguments"
 $DetectArguments = New-Object System.Collections.ArrayList

tasks/detect-task/lib/detect.ps1

@@ -44,7 +44,7 @@ $EnvHomeTempFolder = "$HOME\tmp"
 # heap size, you would set DETECT_JAVA_OPTS=-Xmx6G.
 #$DetectJavaOpts = Get-EnvironmentVariable -Key "DETECT_JAVA_OPTS" -DefaultValue "";
 
-$Version = "0.6.2"
+$Version = "0.6.4"
 
 $DetectReleaseBaseUrl = "https://test-repo.blackducksoftware.com/artifactory/bds-integrations-release/com/blackducksoftware/integration/hub-detect"
 $DetectSnapshotBaseUrl = "https://test-repo.blackducksoftware.com/artifactory/bds-integrations-snapshot/com/blackducksoftware/integration/hub-detect"
@@ -95,6 +95,11 @@ function Get-ProxyInfo () {
     try {
 
         $ProxyHost = ${Env:blackduck.hub.proxy.host};
+        
+        if ([string]::IsNullOrEmpty($ProxyHost)){
+			$ProxyHost = ${BLACKDUCK_HUB_PROXY_HOST};
+		}
+        
         if ([string]::IsNullOrEmpty($ProxyHost)){
             Write-Host "Skipping proxy, no host found."
         }else{
@@ -104,6 +109,10 @@ function Get-ProxyInfo () {
 
             $ProxyPort = ${Env:blackduck.hub.proxy.port};
 
+			if ([string]::IsNullOrEmpty($ProxyPort)){
+				$ProxyPort = ${Env:BLACKDUCK_HUB_PROXY_PORT};
+			}
+
             if ([string]::IsNullOrEmpty($ProxyPort)){
                 Write-Host "No proxy port found."
             }else{
@@ -116,6 +125,14 @@ function Get-ProxyInfo () {
             #Handle credentials
             $ProxyUsername = ${Env:blackduck.hub.proxy.username};
             $ProxyPassword = ${Env:blackduck.hub.proxy.password};
+            
+            if ([string]::IsNullOrEmpty($ProxyUsername)){
+				$ProxyUsername = ${BLACKDUCK_HUB_PROXY_USERNAME};
+			}
+			
+			if ([string]::IsNullOrEmpty($ProxyPassword)){
+				$ProxyPassword = ${BLACKDUCK_HUB_PROXY_PASSWORD};
+			}
 
             if ([string]::IsNullOrEmpty($ProxyPassword) -or [string]::IsNullOrEmpty($ProxyUsername)){
                 Write-Host "No proxy credentials found."
@@ -127,11 +144,11 @@ function Get-ProxyInfo () {
                 $ProxyInfoProperties.Credentials = $ProxyCredentials;
             }
 
-            Write-Host "Succesfully setup proxy."
+            Write-Host "Successfully setup proxy."
         }
 
     } catch [Exception] {
-        Write-Host ("An exception occured setting up the proxy, will continue but will not use a proxy.")
+        Write-Host ("An exception occurred setting up the proxy, will continue but will not use a proxy.")
         Write-Host ("  Reason: {0}" -f $_.Exception.GetType().FullName); 
         Write-Host ("  Reason: {0}" -f $_.Exception.Message); 
         Write-Host ("  Reason: {0}" -f $_.Exception.StackTrace); 
@@ -143,7 +160,27 @@ function Get-ProxyInfo () {
 }
 
 function Invoke-WebRequestWrapper($Url, $ProxyInfo, $DownloadLocation = $null) {
-    return Invoke-WebRequest $Url -UseBasicParsing -OutFile $DownloadLocation -Proxy $ProxyInfo.Uri -ProxyCredential $ProxyInfo.Credentials
+    $parameters = @{}
+    try {
+        if ($DownloadLocation -ne $null){
+            $parameters.Add("OutFile", $DownloadLocation);
+        }
+        if ($ProxyInfo -ne $null){
+            if ($ProxyInfo.Uri -ne $null){
+                $parameters.Add("Proxy", $ProxyInfo.Uri);
+            }
+            if ($ProxyInfo.Credentials -ne $null){
+                $parameters.Add("ProxyCredential",$ProxyInfo.Credentials);
+            }
+        }
+    }catch [Exception] {
+        Write-Host ("An exception occurred setting additional properties on web request.")
+        Write-Host ("  Reason: {0}" -f $_.Exception.GetType().FullName); 
+        Write-Host ("  Reason: {0}" -f $_.Exception.Message); 
+        Write-Host ("  Reason: {0}" -f $_.Exception.StackTrace);
+    }
+    
+    return Invoke-WebRequest $Url -UseBasicParsing @parameters
 }
 
 function Get-DetectSnapshotJar ($DetectFolder, $DetectVersion, $ProxyInfo) {

tasks/detect-task/task.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": "1",
     "Minor": "0",
-    "Patch": "3"
+    "Patch": "4"
   },
   "minimumAgentVersion": "1.95.0",
   "instanceNameFormat": "Run Black Duck Detect for your build $(message)",

vsts-extension.json

@@ -1,7 +1,7 @@
 {
   "manifestVersion": 1,
   "id": "detect-for-tfs",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "name": "Black Duck Detect",
   "publisher": "black-duck-software",
   "public": true,