Fix issue finding matching machine from server (#243)

The `cTentacleAgent::Get-TentacleThumbprint` function was not returning the thumbprint, so it was matching other machines (targets) on the server that didn't have a thumbprint property (ie, cloud regions)

This commit changes the data setup so that there are other machines, causing the same issue as reported in the attached issues

Fixes #246
Fixes #242

OctopusDSC/OctopusDSCHelpers.ps1

@@ -218,6 +218,7 @@ function Invoke-TentacleCommand ($arguments) {
         throw "Command returned exit code $LASTEXITCODE. Aborting."
     }
     Write-Verbose "done."
+    return $output
 }
 
 function Write-CommandOutput {

Tests/Scenarios/Tentacle_Scenario_01_Install.ps1

@@ -61,7 +61,7 @@ Configuration Tentacle_Scenario_01_Install
             # Registration - all parameters required
             ApiKey = $ApiKey;
             OctopusServerUrl = $OctopusServerUrl;
-            Environments = $Environments;
+            Environments = "Env2";
             Roles = $Roles;
 
             # Optional settings
@@ -130,7 +130,7 @@ Configuration Tentacle_Scenario_01_Install
             PublicHostNameConfiguration = "ComputerName"
             TentacleHomeDirectory = "C:\Octopus\WorkerTentacleHome"
 
-            WorkerPools = @("Default Worker Pool")
+            WorkerPools = @("Secondary Worker Pool")
         }
 
         # load the credential for said user

Tests/Scenarios/Tentacle_Scenario_02_Remove.ps1

@@ -51,6 +51,7 @@ Configuration Tentacle_Scenario_02_Remove
             # Registration - all parameters required
             ApiKey = $ApiKey;
             OctopusServerUrl = $OctopusServerUrl;
+            Environments = "Env2";
             Roles = $Roles;
 
             # Optional settings
@@ -127,7 +128,7 @@ Configuration Tentacle_Scenario_02_Remove
             PublicHostNameConfiguration = "ComputerName"
             TentacleHomeDirectory = "C:\Octopus\WorkerTentacleHome"
 
-            WorkerPools = @("Default Worker Pool")
+            WorkerPools = @("Secondary Worker Pool")
         }
 
 

Tests/Spec/tentacle_scenario_01_install_spec.rb

@@ -75,7 +75,7 @@
   it { should be_registered_with_the_server }
   it { should be_online }
   it { should be_polling_tentacle }
-  it { should be_in_environment('The-Env') }
+  it { should be_in_environment('Env2') }
   it { should have_role('Test-Tentacle') }
   it { should have_display_name("#{ENV['COMPUTERNAME']}_PollingTentacle") }
   it { should have_policy('Default Machine Policy') }

Tests/configure-octopus-for-tentacle-tests.ps1

@@ -30,6 +30,7 @@ try
     #create an environment for the tentacles to go into
     $environmentEditor = $repository.Environments.CreateOrModify("The-Env")
     $environment = $environmentEditor.Instance
+    $repository.Environments.CreateOrModify("Env2") | Out-Null
 
     #create a project
     $projectGroup = $repository.ProjectGroups.Get("ProjectGroups-1")
@@ -63,6 +64,13 @@ try
     $policyResource.Description = "Test Machine Policy"
     $repository.MachinePolicies.Create($policyResource) | Out-Null
 
+    #ensure we have a worker pool
+    $repository.WorkerPools.CreateOrModify("Secondary Worker Pool") #| Out-Null
+
+    #ensure we have a cloud region (ie, something without a thumbprint, to catch null thumbprint errors)
+    $cloudRegionEndpoint = New-Object Octopus.Client.Model.Endpoints.CloudRegionEndpointResource
+    $repository.Machines.CreateOrModify("My Cloud Region", $cloudRegionEndpoint, @($environment), @("cloud-region")) | Out-Null
+
     $certificate = Invoke-RestMethod "$OctopusURI/api/configuration/certificates/certificate-global?apikey=$($createApiKeyResult.ApiKey)"
     $content = @{
         "OctopusServerUrl" = $OctopusURI;