Merge pull request #33 from markcowl/deprecate

Deprecate SubscriptionDataFile
Azure · Dec 5, 2014 · 723176f · 723176f
2 parents bb51d60 + 6223788
commit 723176f
Show file tree

Hide file tree

Showing 4 changed files with 4,092 additions and 4,053 deletions.
diff --git a/src/Common/Commands.Common/Common/SubscriptionCmdletBase.cs b/src/Common/Commands.Common/Common/SubscriptionCmdletBase.cs
@@ -14,6 +14,7 @@
 
 using System.Management.Automation;
 using Microsoft.WindowsAzure.Commands.Common;
+using Microsoft.WindowsAzure.Commands.Common.Properties;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.WindowsAzure.Commands.Utilities.Profile
@@ -25,7 +26,7 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.Profile
     /// </summary>
     public abstract class SubscriptionCmdletBase : AzurePSCmdlet
     {
-        [Parameter(Mandatory = false, HelpMessage = "File storing subscription data, if not set uses default.")]
+        [Parameter(Mandatory = false, HelpMessage = "[Deprecated]: File storing subscription data, if not set uses default.")]
         public string SubscriptionDataFile { get; set; }
 
         private readonly bool _saveProfile;
@@ -40,6 +41,7 @@ protected override void BeginProcessing()
             if (!string.IsNullOrEmpty(SubscriptionDataFile))
             {
                 ProfileClient = new ProfileClient(SubscriptionDataFile);
+                WriteWarning(Resources.SubscriptionDataFileDeprecated);
             }
             else
             {

diff --git a/src/Common/Commands.Common/Properties/Resources.Designer.cs b/src/Common/Commands.Common/Properties/Resources.Designer.cs
diff --git a/src/Common/Commands.Common/Properties/Resources.resx b/src/Common/Commands.Common/Properties/Resources.resx
@@ -1573,4 +1573,7 @@ use and privacy statement at &lt;url&gt; and (c) agree to sharing my contact inf
   <data name="RemoveProfileMessage" xml:space="preserve">
     <value>Removing the Azure profile</value>
   </data>
+  <data name="SubscriptionDataFileDeprecated" xml:space="preserve">
+    <value>The SubscriptionDataFile parameter is deprecated.  This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information.</value>
+  </data>
 </root>