Skip to content

Commit b3b331c

Browse files
Merge pull request #37 from Azure/dev
PR from parent
2 parents 1364ab7 + f97b507 commit b3b331c

29 files changed

+31
-0
lines changed

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AddAzureHDInsightConfigValuesCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ protected override void EndProcessing()
161161
{
162162
try
163163
{
164+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
164165
this.command.EndProcessing().Wait();
165166
foreach (AzureHDInsightConfig output in this.command.Output)
166167
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AddAzureHDInsightMetastoreCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ protected override void EndProcessing()
106106
{
107107
try
108108
{
109+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
109110
this.command.EndProcessing().Wait();
110111
foreach (AzureHDInsightConfig output in this.command.Output)
111112
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AddAzureHDInsightScriptActionCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ protected override void EndProcessing()
105105
{
106106
try
107107
{
108+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
108109
this.command.EndProcessing().Wait();
109110
foreach (AzureHDInsightConfig output in this.command.Output)
110111
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AddAzureHDInsightStorageCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ protected override void EndProcessing()
8282
{
8383
try
8484
{
85+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
8586
this.command.EndProcessing().Wait();
8687
foreach (AzureHDInsightConfig output in this.command.Output)
8788
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AzureHDInsightCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public abstract class AzureHDInsightCmdlet : AzurePSCmdlet
3838

3939
private ILogWriter logger;
4040

41+
4142
/// <summary>
4243
/// Gets or sets a value indicating whether logging should be enabled.
4344
/// </summary>

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AzureHdInsightPowerShellHardCodes.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,8 @@ internal class AzureHdInsightPowerShellConstants
104104
public const string Show = "Show";
105105
public const string Skip = "Skip";
106106
public const string ToDateTime = "To";
107+
108+
public const string AsmWarning =
109+
"WARNING: The Azure Service Management (ASM) cmdlets for HDInsight are deprecated and will be non-default in a future release, and they will be removed soon thereafter. Please use Switch-AzureMode AzureResourceManager to use the Azure Resource Manager cmdlets for HDInsight.";
107110
}
108111
}

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/GetAzureHDInsightClusterCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ protected override void EndProcessing()
108108
{
109109
try
110110
{
111+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
111112
this.command.CurrentSubscription = this.GetCurrentSubscription(this.Subscription, this.Certificate);
112113
this.command.Logger = this.Logger;
113114
Task task = this.command.EndProcessing();

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/GetAzureHDInsightJobCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ protected override void EndProcessing()
128128
{
129129
try
130130
{
131+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
131132
this.command.CurrentSubscription = this.GetCurrentSubscription(this.Subscription, this.Certificate);
132133
this.command.Logger = this.Logger;
133134
Task task = this.command.EndProcessing();

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/GetAzureHDInsightJobOutputCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ public string TaskLogsDirectory
140140
/// <inheritdoc />
141141
protected override void EndProcessing()
142142
{
143+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
143144
this.command.Logger = this.Logger;
144145
this.command.CurrentSubscription = this.GetCurrentSubscription(this.Subscription, this.Certificate);
145146
this.AssertTaskLogsDirectorySpecified(this.TaskLogsDirectory);

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/GetAzureHDInsightPropertiesCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public string Subscription
106106
/// </summary>
107107
protected override void EndProcessing()
108108
{
109+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
109110
this.command.Logger = this.Logger;
110111
try
111112
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/GrantAzureHDInsightHttpServicesAccessCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ public string Subscription
130130
/// </summary>
131131
protected override void EndProcessing()
132132
{
133+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
133134
this.command.Enable = true;
134135
try
135136
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/GrantAzureHdinsightRdpAccessCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ public string Subscription
136136
/// </summary>
137137
protected override void EndProcessing()
138138
{
139+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
139140
this.command.Enable = true;
140141
try
141142
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/InvokeHiveCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ protected override void EndProcessing()
138138
this.command.Connection = currentConnection;
139139
try
140140
{
141+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
141142
this.command.Logger = this.Logger;
142143
this.command.CurrentSubscription = this.GetCurrentSubscription(string.Empty, null);
143144
Task task = this.command.EndProcessing();

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/NewAzureHDInsightClusterCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ protected override void BeginProcessing()
436436
/// <inheritdoc />
437437
protected override void EndProcessing()
438438
{
439+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
439440
DateTime start = DateTime.Now;
440441
string msg = string.Format(CultureInfo.CurrentCulture, "Create Cluster Started : {0}", start.ToString(CultureInfo.CurrentCulture));
441442
this.Logger.Log(Severity.Informational, Verbosity.Detailed, msg);

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/NewAzureHDInsightClusterConfigCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public string ZookeeperNodeVMSize
107107
/// </summary>
108108
protected override void EndProcessing()
109109
{
110+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
110111
this.command.EndProcessing().Wait();
111112
foreach (AzureHDInsightConfig output in this.command.Output)
112113
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/NewAzureHDInsightHiveJobDefinitionCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ public string StatusFolder
116116
/// </summary>
117117
protected override void EndProcessing()
118118
{
119+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
119120
if (this.File.IsNullOrEmpty() && this.Query.IsNullOrEmpty())
120121
{
121122
throw new PSArgumentException("Either File or Query should be specified for Hive jobs.");

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/NewAzureHDInsightMapReduceDefinitionCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ public string StatusFolder
118118
/// </summary>
119119
protected override void EndProcessing()
120120
{
121+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
121122
this.command.EndProcessing().Wait();
122123
foreach (AzureHDInsightMapReduceJobDefinition output in this.command.Output)
123124
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/NewAzureHDInsightPigJobDefinitionCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public string StatusFolder
9090
/// </summary>
9191
protected override void EndProcessing()
9292
{
93+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
9394
if (this.File.IsNullOrEmpty() && this.Query.IsNullOrEmpty())
9495
{
9596
throw new PSArgumentException("Either File or Query should be specified for Pig jobs.");

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/NewAzureHDInsightSqoopJobDefinitionCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public string StatusFolder
7979
/// </summary>
8080
protected override void EndProcessing()
8181
{
82+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
8283
if (this.File.IsNullOrEmpty() && this.Command.IsNullOrEmpty())
8384
{
8485
throw new PSArgumentException("Either File or Command should be specified for Sqoop jobs.");

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/NewAzureHDInsightStreamingJobDefinitionCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ public string StatusFolder
142142
/// </summary>
143143
protected override void EndProcessing()
144144
{
145+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
145146
this.command.EndProcessing().Wait();
146147
foreach (AzureHDInsightStreamingMapReduceJobDefinition output in this.command.Output)
147148
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/RemoveClusterHDInsightClusterCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ public string Subscription
105105
/// </summary>
106106
protected override void EndProcessing()
107107
{
108+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
108109
try
109110
{
110111
this.command.CurrentSubscription = this.GetCurrentSubscription(this.Subscription, this.Certificate);

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/RevokeAzureHDInsightHttpServicesAccessCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ public string Subscription
129129
/// </summary>
130130
protected override void EndProcessing()
131131
{
132+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
132133
this.command.Enable = false;
133134
try
134135
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/RevokeAzureHDInsightRdpAccessCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ public string Subscription
134134
/// </summary>
135135
protected override void EndProcessing()
136136
{
137+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
137138
this.command.Enable = false;
138139
try
139140
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/SetAzureHDInsightClusterSizeCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public SetAzureHDInsightClusterSizeCmdlet()
124124

125125
protected override void EndProcessing()
126126
{
127+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
127128
if (Cluster != null)
128129
{
129130
Name = Cluster.Name;

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/SetAzureHDInsightDefaultStorageCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public string StorageContainerName
8888
/// <inheritdoc />
8989
protected override void EndProcessing()
9090
{
91+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
9192
this.command.EndProcessing().Wait();
9293
foreach (AzureHDInsightConfig output in this.command.Output)
9394
{

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/StartAzureHDInsightJobCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ public string Subscription
126126
/// <inheritdoc />
127127
protected override void EndProcessing()
128128
{
129+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
129130
try
130131
{
131132
this.command.Logger = this.Logger;

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/StopAzureHDInsightJobCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public string Subscription
123123
/// <inheritdoc />
124124
protected override void EndProcessing()
125125
{
126+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
126127
try
127128
{
128129
this.command.Logger = this.Logger;

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/UseAzureHDInsightClusterCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ public string Subscription
109109
/// </summary>
110110
protected override void EndProcessing()
111111
{
112+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
112113
try
113114
{
114115
this.command.Logger = this.Logger;

src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/WaitAzureHDInsightJobCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ public double WaitTimeoutInSeconds
158158
/// <inheritdoc />
159159
protected override void EndProcessing()
160160
{
161+
this.WriteWarning(AzureHdInsightPowerShellConstants.AsmWarning);
161162
try
162163
{
163164
this.command.Logger = this.Logger;

0 commit comments

Comments
 (0)