Skip to content

Commit 3471c65

Browse files
MiYanniMiYanni
authored
Merge pull request #7712 from MiYanni/ifdef-tagging
Tagging #if statements for Az
2 parents 40ab3ed + 55900e5 commit 3471c65

File tree

152 files changed

+11301
-2045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+11301
-2045
lines changed

‎src/ResourceManager/Aks/Commands.Aks/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Minor changes for upcoming AzureRM to Az transition
2122

2223
## Version 0.0.7
2324
* Update dependencies for type mapping issue

‎src/ResourceManager/Aks/Commands.Aks/Commands.Aks.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
<EmbeddedResource Include="Properties\Resources.resx">
113113
<Generator>ResXFileCodeGenerator</Generator>
114114
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
115+
<SubType>Designer</SubType>
115116
</EmbeddedResource>
116117
</ItemGroup>
117118
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/ResourceManager/Aks/Commands.Aks/Commands/StartAzureRmAksDashboard.cs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -178,34 +178,27 @@ public override void ExecuteCmdlet()
178178

179179
private void PopBrowser(string uri)
180180
{
181-
#if NETSTANDARD
182-
183181
var browserProcess = new Process
184182
{
185-
StartInfo = new ProcessStartInfo
186-
{
187-
UseShellExecute = true,
188-
Arguments = uri
189-
}
183+
StartInfo = new ProcessStartInfo { Arguments = uri }
190184
};
191-
185+
var verboseMessage = Resources.StartingOnDefault;
186+
// TODO: Remove IfDef
187+
#if NETSTANDARD
192188
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
193189
{
194-
WriteVerbose("Starting on OSX with open");
190+
verboseMessage = "Starting on OSX with open";
195191
browserProcess.StartInfo.FileName = "open";
196-
browserProcess.Start();
197-
return;
198192
}
199193
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
200194
{
201-
WriteVerbose("Starting on Unix with xdg-open");
195+
verboseMessage = "Starting on Unix with xdg-open";
202196
browserProcess.StartInfo.FileName = "xdg-open";
203-
browserProcess.Start();
204-
return;
205197
}
206198
#endif
207-
WriteVerbose(Resources.StartingOnDefault);
208-
Process.Start(uri);
199+
200+
WriteVerbose(verboseMessage);
201+
browserProcess.Start();
209202
}
210203
}
211204

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands/AddAzureASAccount.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected override IAzureContext DefaultContext
8181
{
8282
get
8383
{
84-
// Nothing to do with Azure Resource Managment context
84+
// Nothing to do with Azure Resource Management context
8585
return null;
8686
}
8787
}
@@ -141,8 +141,10 @@ protected override void TearDownHttpClientPipeline()
141141

142142
public override void ExecuteCmdlet()
143143
{
144-
AsAzureAccount azureAccount = new AsAzureAccount();
145-
azureAccount.Type = ServicePrincipal ? AsAzureAccount.AccountType.ServicePrincipal : AsAzureAccount.AccountType.User;
144+
var azureAccount = new AsAzureAccount
145+
{
146+
Type = ServicePrincipal ? AsAzureAccount.AccountType.ServicePrincipal : AsAzureAccount.AccountType.User
147+
};
146148

147149
SecureString password = null;
148150
if (Credential != null)
@@ -183,6 +185,7 @@ public override void ExecuteCmdlet()
183185
{
184186
AsAzureClientSession.Instance.SetCurrentContext(azureAccount, AsEnvironment);
185187
}
188+
// TODO: Remove IfDef
186189
#if NETSTANDARD
187190
var asAzureProfile = AsAzureClientSession.Instance.Login(currentProfile.Context, password, WriteWarning);
188191
#else

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands/Export-AzureAsInstanceLog.cs

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
2828
{
29-
3029
/// <summary>
3130
/// Cmdlet to export an Analysis Services server log to file
3231
/// </summary>
@@ -35,7 +34,7 @@ namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
3534
[OutputType(typeof(void))]
3635
public class ExportAzureAnalysisServerLog : AzurePSCmdlet
3736
{
38-
private string serverName;
37+
private string _serverName;
3938

4039
[Parameter(Mandatory = true, HelpMessage = "Name of the Azure Analysis Services which log will be fetched")]
4140
[ValidateNotNullOrEmpty]
@@ -55,21 +54,21 @@ public class ExportAzureAnalysisServerLog : AzurePSCmdlet
5554

5655
public ExportAzureAnalysisServerLog()
5756
{
58-
this.AsAzureHttpClient = new AsAzureHttpClient(() => new HttpClient());
59-
this.TokenCacheItemProvider = new TokenCacheItemProvider();
57+
AsAzureHttpClient = new AsAzureHttpClient(() => new HttpClient());
58+
TokenCacheItemProvider = new TokenCacheItemProvider();
6059
}
6160

62-
public ExportAzureAnalysisServerLog(IAsAzureHttpClient AsAzureHttpClient, ITokenCacheItemProvider TokenCacheItemProvider)
61+
public ExportAzureAnalysisServerLog(IAsAzureHttpClient asAzureHttpClient, ITokenCacheItemProvider tokenCacheItemProvider)
6362
{
64-
this.AsAzureHttpClient = AsAzureHttpClient;
65-
this.TokenCacheItemProvider = TokenCacheItemProvider;
63+
AsAzureHttpClient = asAzureHttpClient;
64+
TokenCacheItemProvider = tokenCacheItemProvider;
6665
}
6766

6867
protected override IAzureContext DefaultContext
6968
{
7069
get
7170
{
72-
// Nothing to do with Azure Resource Managment context
71+
// Nothing to do with Azure Resource Management context
7372
return null;
7473
}
7574
}
@@ -91,14 +90,14 @@ protected override void BeginProcessing()
9190
throw new PSInvalidOperationException(string.Format(Resources.NotLoggedInMessage, ""));
9291
}
9392

94-
serverName = Instance;
93+
_serverName = Instance;
9594
Uri uriResult;
9695

97-
// if the user specifies the FQN of the server, then extract the servername out of that.
96+
// if the user specifies the FQN of the server, then extract the server name out of that.
9897
// and set the current context
9998
if (Uri.TryCreate(Instance, UriKind.Absolute, out uriResult) && uriResult.Scheme == "asazure")
10099
{
101-
serverName = uriResult.PathAndQuery.Trim('/');
100+
_serverName = uriResult.PathAndQuery.Trim('/');
102101
if (string.Compare(AsAzureClientSession.Instance.Profile.Context.Environment.Name, uriResult.DnsSafeHost, StringComparison.InvariantCultureIgnoreCase) != 0)
103102
{
104103
AsAzureClientSession.Instance.SetCurrentContext(
@@ -112,21 +111,18 @@ protected override void BeginProcessing()
112111
if (currentContext != null
113112
&& AsAzureClientSession.AsAzureRolloutEnvironmentMapping.ContainsKey(currentContext.Environment.Name))
114113
{
115-
throw new PSInvalidOperationException(string.Format(Resources.InvalidServerName, serverName));
114+
throw new PSInvalidOperationException(string.Format(Resources.InvalidServerName, _serverName));
116115
}
117116
}
118117

119-
if (this.AsAzureHttpClient == null)
118+
if (AsAzureHttpClient == null)
120119
{
121-
this.AsAzureHttpClient = new AsAzureHttpClient(() =>
122-
{
123-
return new HttpClient();
124-
});
120+
AsAzureHttpClient = new AsAzureHttpClient(() => new HttpClient());
125121
}
126122

127-
if (this.TokenCacheItemProvider == null)
123+
if (TokenCacheItemProvider == null)
128124
{
129-
this.TokenCacheItemProvider = new TokenCacheItemProvider();
125+
TokenCacheItemProvider = new TokenCacheItemProvider();
130126
}
131127
}
132128

@@ -140,48 +136,46 @@ public override void ExecuteCmdlet()
140136
if (ShouldProcess(Instance, Resources.ExportingLogFromAnalysisServicesServer))
141137
{
142138
var context = AsAzureClientSession.Instance.Profile.Context;
143-
#if NETSTANDARD
144-
AsAzureClientSession.Instance.Login(context, null, null);
145-
#else
146139
AsAzureClientSession.Instance.Login(context, null);
147-
#endif
148-
string accessToken = this.TokenCacheItemProvider.GetTokenFromTokenCache(
140+
141+
var accessToken = TokenCacheItemProvider.GetTokenFromTokenCache(
149142
AsAzureClientSession.TokenCache, context.Account.UniqueId);
150143

151-
Uri logfileBaseUri =
152-
new Uri(string.Format("{0}{1}{2}", Uri.UriSchemeHttps, Uri.SchemeDelimiter, context.Environment.Name));
144+
var logfileBaseUri = new Uri($"{Uri.UriSchemeHttps}{Uri.SchemeDelimiter}{context.Environment.Name}");
153145

154-
UriBuilder resolvedUriBuilder = new UriBuilder(logfileBaseUri);
155-
resolvedUriBuilder.Host = ClusterResolve(logfileBaseUri, accessToken, serverName);
146+
var resolvedUriBuilder = new UriBuilder(logfileBaseUri)
147+
{
148+
Host = ClusterResolve(logfileBaseUri, accessToken, _serverName)
149+
};
156150

157151
var logfileEndpoint = string.Format(
158152
(string) context.Environment.Endpoints[AsAzureEnvironment.AsRolloutEndpoints.LogfileEndpointFormat],
159-
serverName);
153+
_serverName);
160154

161-
this.AsAzureHttpClient.resetHttpClient();
162-
using (HttpResponseMessage message = AsAzureHttpClient.CallGetAsync(
155+
AsAzureHttpClient.resetHttpClient();
156+
using (var message = AsAzureHttpClient.CallGetAsync(
163157
resolvedUriBuilder.Uri,
164158
logfileEndpoint,
165159
accessToken).ConfigureAwait(false).GetAwaiter().GetResult())
166160
{
167161
message.EnsureSuccessStatusCode();
168-
string actionWarning = string.Format(CultureInfo.CurrentCulture, Resources.ExportingLogOverwriteWarning, this.OutputPath);
169-
if (AzureSession.Instance.DataStore.FileExists(this.OutputPath) && !this.Force.IsPresent && !ShouldContinue(actionWarning, Resources.Confirm))
162+
var actionWarning = string.Format(CultureInfo.CurrentCulture, Resources.ExportingLogOverwriteWarning, OutputPath);
163+
if (AzureSession.Instance.DataStore.FileExists(OutputPath) && !Force.IsPresent && !ShouldContinue(actionWarning, Resources.Confirm))
170164
{
171165
return;
172166
}
173-
AzureSession.Instance.DataStore.WriteFile(this.OutputPath, message.Content.ReadAsStringAsync().Result);
167+
AzureSession.Instance.DataStore.WriteFile(OutputPath, message.Content.ReadAsStringAsync().Result);
174168
}
175169
}
176170
}
177171

178172
private string ClusterResolve(Uri clusterUri, string accessToken, string serverName)
179173
{
180-
var resolveEndpoint = "/webapi/clusterResolve";
174+
const string resolveEndpoint = "/webapi/clusterResolve";
181175
var content = new StringContent($"ServerName={serverName}");
182176
content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/x-www-form-urlencoded");
183177

184-
using (HttpResponseMessage message = AsAzureHttpClient.CallPostAsync(
178+
using (var message = AsAzureHttpClient.CallPostAsync(
185179
clusterUri,
186180
resolveEndpoint,
187181
accessToken,

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands/Restart-AzureAsInstance.cs

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
3030
[OutputType(typeof(bool))]
3131
public class RestartAzureAnalysisServer : AzurePSCmdlet
3232
{
33-
private string serverName;
33+
private string _serverName;
3434

3535
[Parameter(Mandatory = true, HelpMessage = "Name of the Azure Analysis Services server to restart")]
3636
[ValidateNotNullOrEmpty]
@@ -45,22 +45,22 @@ public class RestartAzureAnalysisServer : AzurePSCmdlet
4545

4646
public RestartAzureAnalysisServer()
4747
{
48-
this.AsAzureHttpClient = new AsAzureHttpClient(() => new HttpClient());
49-
this.TokenCacheItemProvider = new TokenCacheItemProvider();
48+
AsAzureHttpClient = new AsAzureHttpClient(() => new HttpClient());
49+
TokenCacheItemProvider = new TokenCacheItemProvider();
5050

5151
}
5252

53-
public RestartAzureAnalysisServer(IAsAzureHttpClient AsAzureHttpClient, ITokenCacheItemProvider TokenCacheItemProvider)
53+
public RestartAzureAnalysisServer(IAsAzureHttpClient asAzureHttpClient, ITokenCacheItemProvider tokenCacheItemProvider)
5454
{
55-
this.AsAzureHttpClient = AsAzureHttpClient;
56-
this.TokenCacheItemProvider = TokenCacheItemProvider;
55+
AsAzureHttpClient = asAzureHttpClient;
56+
TokenCacheItemProvider = tokenCacheItemProvider;
5757
}
5858

5959
protected override IAzureContext DefaultContext
6060
{
6161
get
6262
{
63-
// Nothing to do with Azure Resource Managment context
63+
// Nothing to do with Azure Resource Management context
6464
return null;
6565
}
6666
}
@@ -82,14 +82,14 @@ protected override void BeginProcessing()
8282
throw new PSInvalidOperationException(string.Format(Resources.NotLoggedInMessage, ""));
8383
}
8484

85-
serverName = Instance;
85+
_serverName = Instance;
8686
Uri uriResult;
8787

88-
// if the user specifies the FQN of the server, then extract the servername out of that.
88+
// if the user specifies the FQN of the server, then extract the server name out of that.
8989
// and set the current context
9090
if (Uri.TryCreate(Instance, UriKind.Absolute, out uriResult) && uriResult.Scheme == "asazure")
9191
{
92-
serverName = uriResult.PathAndQuery.Trim('/');
92+
_serverName = uriResult.PathAndQuery.Trim('/');
9393
if (string.Compare(AsAzureClientSession.Instance.Profile.Context.Environment.Name, uriResult.DnsSafeHost, StringComparison.InvariantCultureIgnoreCase) != 0)
9494
{
9595
AsAzureClientSession.Instance.SetCurrentContext(
@@ -103,21 +103,18 @@ protected override void BeginProcessing()
103103
if (currentContext != null
104104
&& AsAzureClientSession.AsAzureRolloutEnvironmentMapping.ContainsKey(currentContext.Environment.Name))
105105
{
106-
throw new PSInvalidOperationException(string.Format(Resources.InvalidServerName, serverName));
106+
throw new PSInvalidOperationException(string.Format(Resources.InvalidServerName, _serverName));
107107
}
108108
}
109109

110-
if (this.AsAzureHttpClient == null)
110+
if (AsAzureHttpClient == null)
111111
{
112-
this.AsAzureHttpClient = new AsAzureHttpClient(() =>
113-
{
114-
return new HttpClient();
115-
});
112+
AsAzureHttpClient = new AsAzureHttpClient(() => new HttpClient());
116113
}
117114

118-
if (this.TokenCacheItemProvider == null)
115+
if (TokenCacheItemProvider == null)
119116
{
120-
this.TokenCacheItemProvider = new TokenCacheItemProvider();
117+
TokenCacheItemProvider = new TokenCacheItemProvider();
121118
}
122119
}
123120

@@ -131,18 +128,15 @@ public override void ExecuteCmdlet()
131128
if (ShouldProcess(Instance, Resources.RestartingAnalysisServicesServer))
132129
{
133130
var context = AsAzureClientSession.Instance.Profile.Context;
134-
#if NETSTANDARD
135-
AsAzureClientSession.Instance.Login(context, null, null);
136-
#else
137131
AsAzureClientSession.Instance.Login(context, null);
138-
#endif
139-
string accessToken = this.TokenCacheItemProvider.GetTokenFromTokenCache(AsAzureClientSession.TokenCache, context.Account.UniqueId);
140132

141-
Uri restartBaseUri = new Uri(string.Format("{0}{1}{2}", Uri.UriSchemeHttps, Uri.SchemeDelimiter, context.Environment.Name));
133+
var accessToken = TokenCacheItemProvider.GetTokenFromTokenCache(AsAzureClientSession.TokenCache, context.Account.UniqueId);
134+
135+
var restartBaseUri = new Uri($"{Uri.UriSchemeHttps}{Uri.SchemeDelimiter}{context.Environment.Name}");
142136

143-
var restartEndpoint = string.Format((string)context.Environment.Endpoints[AsAzureEnvironment.AsRolloutEndpoints.RestartEndpointFormat], serverName);
137+
var restartEndpoint = string.Format((string)context.Environment.Endpoints[AsAzureEnvironment.AsRolloutEndpoints.RestartEndpointFormat], _serverName);
144138

145-
using (HttpResponseMessage message = AsAzureHttpClient.CallPostAsync(
139+
using (var message = AsAzureHttpClient.CallPostAsync(
146140
restartBaseUri,
147141
restartEndpoint,
148142
accessToken).Result)

0 commit comments

Comments
 (0)