Merge pull request #5752 from maddieclayton/fixdefault

cormacpayne · web-flow · commit 37ad7df5a470 · 2018-03-20T08:39:08.000-07:00
Fix defaultresourcegroup in CloudShell
diff --git a/src/ResourceManager/AnalysisServices/ChangeLog.md b/src/ResourceManager/AnalysisServices/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 * Fixed issue with cleaning up scripts in build
 
 ## Version 0.6.4
diff --git a/src/ResourceManager/ApiManagement/ChangeLog.md b/src/ResourceManager/ApiManagement/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 5.1.0
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/ApplicationInsights/ChangeLog.md b/src/ResourceManager/ApplicationInsights/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.1.1
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/Automation/ChangeLog.md b/src/ResourceManager/Automation/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.3.0
 * Fixed issue with importing aliases
diff --git a/src/ResourceManager/AzureBackup/ChangeLog.md b/src/ResourceManager/AzureBackup/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.0.2
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/AzureBatch/ChangeLog.md b/src/ResourceManager/AzureBatch/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.0.4
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/Cdn/ChangeLog.md b/src/ResourceManager/Cdn/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 * Fixed issue with cleaning up scripts in build
 
 ## Version 4.2.0
diff --git a/src/ResourceManager/CognitiveServices/ChangeLog.md b/src/ResourceManager/CognitiveServices/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.9.2
 * Update notice.txt and notice message.
diff --git a/src/ResourceManager/Compute/ChangeLog.md b/src/ResourceManager/Compute/ChangeLog.md
@@ -23,6 +23,7 @@
 * Log analytic feature
     - Added `Export-AzureRmLogAnalyticRequestRateByInterval` cmdlet
     - Added `Export-AzureRmLogAnalyticThrottledRequests` cmdlet
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.4.0
 * `New-AzureRmVMSS` prints connection strings in verbose mode.
diff --git a/src/ResourceManager/ContainerInstance/ChangeLog.md b/src/ResourceManager/ContainerInstance/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.2.3
 * Apply Azure Container Instance SDK 2018-02-01
diff --git a/src/ResourceManager/ContainerRegistry/ChangeLog.md b/src/ResourceManager/ContainerRegistry/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 1.0.2
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/DataFactories/ChangeLog.md b/src/ResourceManager/DataFactories/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.2.0
 * Fix credential encryption issue that caused no meaningful error for some encryption operations
diff --git a/src/ResourceManager/DataLakeAnalytics/ChangeLog.md b/src/ResourceManager/DataLakeAnalytics/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.2.1
 * Corrected usage of 'Login-AzureRmAccount' to use 'Connect-AzureRmAccount'
diff --git a/src/ResourceManager/DevTestLabs/ChangeLog.md b/src/ResourceManager/DevTestLabs/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.0.2
 * Fixed all of the GET cmdlets which previously weren't working.
diff --git a/src/ResourceManager/Dns/ChangeLog.md b/src/ResourceManager/Dns/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.1.0
 * Support for Private DNS Zones (Public Preview)
diff --git a/src/ResourceManager/EventHub/ChangeLog.md b/src/ResourceManager/EventHub/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.6.1
 * Fix bug in Get-AzureRmEventHubGeoDRConfiguration help
diff --git a/src/ResourceManager/HDInsight/ChangeLog.md b/src/ResourceManager/HDInsight/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.1.0
 * Fixed issue with importing aliases
diff --git a/src/ResourceManager/Insights/ChangeLog.md b/src/ResourceManager/Insights/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.0.2
 * Corrected usage of 'Login-AzureRmAccount' to use 'Connect-AzureRmAccount'
diff --git a/src/ResourceManager/IotHub/ChangeLog.md b/src/ResourceManager/IotHub/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 3.1.0
 * Add Certificate support for IoTHub cmdlets
diff --git a/src/ResourceManager/KeyVault/ChangeLog.md b/src/ResourceManager/KeyVault/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.2.0
 * Fixed example for Set-AzureRmKeyVaultAccessPolicy
diff --git a/src/ResourceManager/LogicApp/ChangeLog.md b/src/ResourceManager/LogicApp/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.0.1
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/MachineLearning/ChangeLog.md b/src/ResourceManager/MachineLearning/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.17.0
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/MachineLearningCompute/ChangeLog.md b/src/ResourceManager/MachineLearningCompute/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.4.0
 * Add IncludeAllResources parameter to Remove-AzureRmMlOpCluster cmdlet
diff --git a/src/ResourceManager/Media/ChangeLog.md b/src/ResourceManager/Media/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.9.0
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/Network/ChangeLog.md b/src/ResourceManager/Network/ChangeLog.md
@@ -19,6 +19,7 @@
 --->
 
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 5.4.0
 * Updating model types for compatibility with DNS cmdlets.
diff --git a/src/ResourceManager/OperationalInsights/ChangeLog.md b/src/ResourceManager/OperationalInsights/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 * Fixed issue with cleaning up scripts in build
 
 ## Version 4.3.0
diff --git a/src/ResourceManager/PowerBIEmbedded/ChangeLog.md b/src/ResourceManager/PowerBIEmbedded/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.1.2
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/Profile/Commands.Profile/Default/ClearAzureRmDefault.cs b/src/ResourceManager/Profile/Commands.Profile/Default/ClearAzureRmDefault.cs
@@ -12,14 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;
 using Microsoft.Azure.Commands.Profile.Common;
 using Microsoft.Azure.Commands.Profile.Properties;
-using Microsoft.Azure.Commands.ResourceManager.Common;
-using Microsoft.Azure.Management.Internal.Resources;
-using Microsoft.Azure.Management.Internal.Resources.Models;
+using System;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Profile.Default
@@ -45,6 +42,11 @@ public class ClearAzureRMDefaultCommand : AzureContextModificationCmdlet
 
         public override void ExecuteCmdlet()
         {
+            if (Environment.GetEnvironmentVariable("ACC_CLOUD") != null)
+            {
+                throw new Exception("Default Resource Group cannot be set on CloudShell");
+            }
+
             IAzureContext context = AzureRmProfileProvider.Instance.Profile.DefaultContext;
             // If no parameters are specified, clear all defaults
             if (!ResourceGroup)
diff --git a/src/ResourceManager/Profile/Commands.Profile/Default/GetAzureRmDefault.cs b/src/ResourceManager/Profile/Commands.Profile/Default/GetAzureRmDefault.cs
@@ -18,7 +18,7 @@
 using Microsoft.Azure.Commands.Profile.Properties;
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.Azure.Management.Internal.Resources;
-using Microsoft.Azure.Management.Internal.Resources.Models;
+using System;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Profile.Default
diff --git a/src/ResourceManager/Profile/Commands.Profile/Default/SetAzureRMDefault.cs b/src/ResourceManager/Profile/Commands.Profile/Default/SetAzureRMDefault.cs
@@ -18,10 +18,10 @@
 using Microsoft.Azure.Commands.Profile.Common;
 using Microsoft.Azure.Commands.Profile.Models;
 using Microsoft.Azure.Commands.Profile.Properties;
-using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.Internal.Resources.Models;
+using System;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Profile.Default
@@ -46,6 +46,11 @@ public class SetAzureRMDefaultCommand : AzureContextModificationCmdlet
 
         public override void ExecuteCmdlet()
         {
+            if (Environment.GetEnvironmentVariable("ACC_CLOUD") != null)
+            {
+                throw new Exception("Default Resource Group cannot be set on CloudShell");
+            }
+
             IAzureContext context = AzureRmProfileProvider.Instance.Profile.DefaultContext;
             IResourceManagementClient resourceManagementclient = AzureSession.Instance.ClientFactory.CreateCustomArmClient<ResourceManagementClient>(
                                 context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
diff --git a/src/ResourceManager/RecoveryServices/ChangeLog.md b/src/ResourceManager/RecoveryServices/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.1.0
 * Fixed issue with importing aliases
diff --git a/src/ResourceManager/RedisCache/ChangeLog.md b/src/ResourceManager/RedisCache/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.1.0
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/Relay/ChangeLog.md b/src/ResourceManager/Relay/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.3.1
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/Resources/ChangeLog.md b/src/ResourceManager/Resources/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 5.5.0
 * Fixed issue with importing aliases
diff --git a/src/ResourceManager/Scheduler/ChangeLog.md b/src/ResourceManager/Scheduler/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.16.1
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/ServerManagement/ChangeLog.md b/src/ResourceManager/ServerManagement/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.1.0
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/ServiceBus/ChangeLog.md b/src/ResourceManager/ServiceBus/ChangeLog.md
@@ -19,6 +19,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.6.2
 * Added EnableBatchedOperations property to Queue
diff --git a/src/ResourceManager/ServiceFabric/ChangeLog.md b/src/ResourceManager/ServiceFabric/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.3.2
 * Service Fabric cmdlet refresh
diff --git a/src/ResourceManager/SiteRecovery/ChangeLog.md b/src/ResourceManager/SiteRecovery/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 5.0.4
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/Sql/ChangeLog.md b/src/ResourceManager/Sql/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 * Fixed issue with cleaning up scripts in build
 
 ## Version 4.3.0
diff --git a/src/ResourceManager/Storage/ChangeLog.md b/src/ResourceManager/Storage/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 ## Current Release
 * Fix examples to reflect required lowercase syntax in StorageAccountName
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.2.1
 * Obsolete following parameters in new and set Storage Account cmdlets: EnableEncryptionService and DisableEncryptionService, since Encryption at Rest is enabled by default and can't be disabled.
diff --git a/src/ResourceManager/StreamAnalytics/ChangeLog.md b/src/ResourceManager/StreamAnalytics/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.0.2
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/TrafficManager/ChangeLog.md b/src/ResourceManager/TrafficManager/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.0.1
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
diff --git a/src/ResourceManager/Websites/ChangeLog.md b/src/ResourceManager/Websites/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 ## Current Release
 * Fixed the help for Remove-AzureRmWebAppSlot
+* Fix issue with Default Resource Group in CloudShell
 * Fixed issue with cleaning up scripts in build
 
 ## Version 4.2.0
diff --git a/tools/AzureRM.Example.psm1 b/tools/AzureRM.Example.psm1
