Made changes to make get and remove operations work.

Author: Krishna-Vutukuri

Generated.Azure.Common.Helpers/Generated.Azure.Common.Helpers.psd1

@@ -1,26 +1,48 @@
 
+$script:azureRMProfile = $null
+
 <#
 .DESCRIPTION
     Gets the Azure Profile for the current process. 
     This command uses Login-AzureRMAccount
 #>
+function Get-AzRMProfile
+{
+   [CmdletBinding()]
+   param()
 
+   if (-not $script:azureRMProfile)
+   {
+        $script:azureRMProfile = Login-AzureRmAccount
+   }
+   $script:azureRMProfile
+}
 
-function Get-AzServiceCredntial
+
+function Get-AzServiceCredential
 {
     [CmdletBinding()]
     param()
 
-    $ap = Get-Az
+    $ap = Get-AzRMProfile
     $authenticationFactory = [Microsoft.Azure.Commands.Common.Authentication.Factories.AuthenticationFactory]::new() 
     $serviceCredentials = $authenticationFactory.GetServiceClientCredentials($ap.Context)
     $serviceCredentials
 }
 
-fuction Get-AzDelegatingHandler
+function Get-AzDelegatingHandler
+{
+    [CmdletBinding()]
+    param()
+
+    ,[System.Net.Http.DelegatingHandler[]]::new(0) 
+}
+
+function Get-AzSubscriptionId
 {
     [CmdletBinding()]
     param()
 
-    [System.Net.Http.DelegatingHandler[]]::new(0) 
+    $ap = Get-AzureRmContext -ea stop
+    $ap.Subscription.SubscriptionId
 }

Generated.Azure.Common.Helpers/Generated.Azure.Common.Helpers.psm1

@@ -1,4 +1,4 @@
-[reflection.assembly]::LoadFrom("$PSScriptRoot\Net45\Microsoft.Rest.ClientRuntime.dll")
-[reflection.assembly]::LoadFrom("$PSScriptRoot\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll")
-[reflection.assembly]::LoadFrom("$PSScriptRoot\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll")
-[reflection.assembly]::LoadFrom("$PSScriptRoot\net45\Newtonsoft.Json.dll")
+$null = [reflection.assembly]::LoadFrom("$PSScriptRoot\Net45\Microsoft.Rest.ClientRuntime.dll")
+$null = [reflection.assembly]::LoadFrom("$PSScriptRoot\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll")
+#[reflection.assembly]::LoadFrom("$PSScriptRoot\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll")
+$null = [reflection.assembly]::LoadFrom("$PSScriptRoot\net45\Newtonsoft.Json.dll")

Generated.Azure.Common.Helpers/LoadDependentAssemblies.ps1

@@ -126,13 +126,21 @@ $helpParamStr = @'
 '@
 
 $functionBodyStr = @'
-    $serviceCredentials = Get-AzCredentials
-    $subscriptionId = Get-SubscriptionId
 
-    $clientName = [$fullModuleName]::new($serviceCredentials, [System.Net.Http.DelegatingHandler[]]::new(0))
-    $clientName.ApiVersion = $infoVersion
+    $serviceCredentials =  Get-AzServiceCredential
+    $subscriptionId = Get-AzSubscriptionId
+    $delegatingHandler = Get-AzDelegatingHandler
+
+    $clientName = [$fullModuleName]::new($serviceCredentials, $delegatingHandler)
+    $clientName.ApiVersion = '$infoVersion'
     $clientName.SubscriptionId = $subscriptionId
-    $operationVar = $clientName.$operations.$methodName($requiredParamList)
+    
+    Write-Verbose 'Performing operation $methodName on $clientName.'
+    $taskResult = $clientName.$operations.$methodName($requiredParamList)
+    Write-Verbose "Waiting for the operation to complete."
+    $taskResult.AsyncWaitHandle.WaitOne() | out-null
+    Write-Verbose "Operation Completed."
+    $taskResult.Result.Body.Value
 '@
 
     $commandName = ProcessOperationId $jsonPathItemObject.operationId
@@ -190,9 +198,9 @@ $functionBodyStr = @'
     # Handle the function body
     #region Function Body
     $infoVersion = $Global:parameters['infoVersion']
-    $modulePostfix = $Global:parameters['infoTitle'] + '.'  + $Global:parameters['infoName']
+    $modulePostfix = $Global:parameters['infoName']
     $fullModuleName = $Global:parameters['namespace'] + '.' + $modulePostfix
-    $clientName = '$' + $modulePostfix.Split('.')[$_.count - 1]
+    $clientName = '$' + $modulePostfix
 
     $operationName = $jsonPathItemObject.operationId.Split('_')[0]
     $operationType = $jsonPathItemObject.operationId.Split('_')[1]
@@ -202,6 +210,8 @@ $functionBodyStr = @'
 
     $serviceCredentials = '$' + 'serviceCredentials'
     $subscriptionId = '$' + 'subscriptionId'
+    $delegatingHandler = '$' + 'delegatingHandler'
+    $taskResult = '$taskResult'
 
     $body = $executionContext.InvokeCommand.ExpandString($functionBodyStr)
 
@@ -219,7 +229,7 @@ function ProcessOperationId
     param([string] $opId)
 
     $cmdNounMap = @{"Create" = "New"; "Activate" = "Enable"; "Delete" = "Remove";
-                    "List"   = "Get"}
+                    "List"   = "GetAll"}
     $opIdValues = $opId.Split('_')
     $cmdNoun = $opIdValues[0]
     $cmdVerb = $opIdValues[1]
@@ -337,7 +347,7 @@ function GenerateCsharpCode
         del $net45Dir -Force -Recurse
     }
 
-    & $autoRestExePath -input $swaggerSpecPath -CodeGenerator CSharp -OutputDirectory $generatedCSharpPath -NameSpace $nameSpace
+    & $autoRestExePath -AddCredentials -input $swaggerSpecPath -CodeGenerator CSharp -OutputDirectory $generatedCSharpPath -NameSpace $nameSpace
     if ($LastExitCode)
     {
         throw "AutoRest resulted in an error"
@@ -376,7 +386,7 @@ function GenerateModuleManifest
     Add-Type -LiteralPath "$PSScriptRoot\azure.csharp.ps.generated.dll"
 '@ | out-file -Encoding Ascii $startUpScriptFile
 
-    New-ModuleManifest -Path $moduleManifestFile -Guid (New-Guid) -Author (whoami) -ScriptsToProcess ($moduleName + ".StartupScript.ps1") -RequiredModules "Generated.Azure.Common.Helpers" -RootModule "$rootModule"
+    New-ModuleManifest -Path $moduleManifestFile -Guid (New-Guid) -Author (whoami) -ScriptsToProcess ($moduleName + ".StartupScript.ps1") -RequiredModules "Generated.Azure.Common.Helpers" -RootModule "$rootModule" -FunctionsToExport '*'
 }
 
 #endregion