make RegistrationName mandatory for Remove-AzsRegistration

Author: BradleyBartlett

Registration/RegisterWithAzure.psm1

@@ -317,15 +317,15 @@ function Remove-AzsRegistration{
         [Parameter(Mandatory = $true)]
         [String] $PrivilegedEndpoint,
 
+        [Parameter(Mandatory = $true)]
+        [String] $RegistrationName,
+
         [Parameter(Mandatory = $false)]
         [String] $ResourceGroupName = 'azurestack',
 
         [Parameter(Mandatory = $false)]
         [String] $ResourceGroupLocation = 'westcentralus',
 
-        [Parameter(Mandatory = $false)]
-        [String] $RegistrationName,
-
         [Parameter(Mandatory = $false)]
         [ValidateNotNullorEmpty()]
         [PSObject] $AzureContext = (Get-AzureRmContext)
@@ -351,56 +351,16 @@ function Remove-AzsRegistration{
         # Find registration resource in Azure
         Log-Output "Searching for registration resource in Azure..."
         $registrationResource = $null
-        if ($RegistrationName)
+
+        $registrationResourceId = "/subscriptions/$($AzureContext.Subscription.SubscriptionId)/resourceGroups/$ResourceGroupName/providers/Microsoft.AzureStack/registrations/$registrationName"
+        $registrationResource = Get-AzureRmResource -ResourceId $registrationResourceId -ErrorAction Ignore
+        if ($registrationResource.Properties.cloudId -eq $stampInfo.CloudId)
         {
-            $registrationResourceId = "/subscriptions/$($AzureContext.Subscription.SubscriptionId)/resourceGroups/$ResourceGroupName/providers/Microsoft.AzureStack/registrations/$registrationName"
-            $registrationResource = Get-AzureRmResource -ResourceId $registrationResourceId -ErrorAction Ignore
-            if ($registrationResource.Properties.cloudId -eq $stampInfo.CloudId)
-            {
-                Log-Output "Registration resource found: $($registrationResource.ResourceId)"
-            }
-            else
-            {
-                Log-Throw "The registration resource found does not correlate the current environment's Cloud-Id. `r`nEnvironment Cloud Id: $($stampinfo.CloudId) `r`nResource Cloud Id: $($registrationResource.Properties.cloudId)" -CallingFunction $($PSCmdlet.MyInvocation.MyCommand.Name)
-            }
+            Log-Output "Registration resource found: $($registrationResource.ResourceId)"
         }
         else
         {
-            Log-Output "Parameter 'RegistrationName' not supplied. Searching through all registration resources under current context."
-            try
-            {
-                Log-Output "Attempting to retrieve resources using command: 'Find-AzureRmResource -ResourceType Microsoft.AzureStack/registrations -ResourceGroupNameEquals $ResourceGroupName'"
-                $registrationResources = Find-AzureRmResource -ResourceType Microsoft.AzureStack/registrations -ResourceGroupNameEquals $ResourceGroupName
-            }
-            catch
-            {
-                Log-Warning "Could not retrieve resources from Azure `r`n$($_)"
-            }
-
-            if ($registrationResources.Count -eq 0)
-            {
-                try
-                {
-                    Log-Output "Attempting to retrieve resources using command: 'Get-AzureRmResource -ResourceType microsoft.azurestack/registrations -ResourceGroupName $ResourceGroupName'"
-                    $registrationresources = Get-AzureRmResource -ResourceType microsoft.azurestack/registrations -ResourceGroupName $ResourceGroupName
-                }
-                catch
-                {
-                    Log-Throw "Unable to retrieve registration resource(s) from Azure `r`n$($_)" -CallingFunction $($PSCmdlet.MyInvocation.MyCommand.Name)
-                }
-            }
-
-            Log-Output "Found $($registrationResources.Count) registration resources. Finding a matching CloudId may take some time."
-            foreach ($resource in $registrationResources)
-            {
-                $resourceObject = Get-AzureRmResource -ResourceId "/subscriptions/$($AzureContext.Subscription.SubscriptionId)/resourceGroups/$ResourceGroupName/providers/Microsoft.AzureStack/registrations/$($resource.name)"
-                $resourceCloudId = (($resourceObject.Properties.ToString()) | ConvertFrom-Json).cloudId
-                if ($resourceCloudId -eq $stampInfo.CloudId)
-                {
-                    $registrationResource = $resourceObject
-                    break   
-                }
-            }
+            Log-Throw "The registration resource found does not correlate the current environment's Cloud-Id. `r`nEnvironment Cloud Id: $($stampinfo.CloudId) `r`nResource Cloud Id: $($registrationResource.Properties.cloudId)" -CallingFunction $($PSCmdlet.MyInvocation.MyCommand.Name)
         }
 
         if ($registrationResource)