Skip to content

Commit

Permalink
Release 1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Schulte committed Nov 30, 2017
1 parent 7678af1 commit e3a8ab1
Show file tree
Hide file tree
Showing 2 changed files with 116 additions and 63 deletions.
177 changes: 115 additions & 62 deletions Common/Utilities.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
using Microsoft.Azure.Management.Compute.Fluent;
using Microsoft.Azure.Management.ContainerRegistry.Fluent;
using Microsoft.Azure.Management.ContainerRegistry.Fluent.Models;
using Microsoft.Azure.Management.ContainerService.Fluent;
using Microsoft.Azure.Management.ContainerService.Fluent.Models;
using Microsoft.Azure.Management.KeyVault.Fluent;
using Microsoft.Azure.Management.Network.Fluent;
using Microsoft.Azure.Management.Redis.Fluent;
Expand Down Expand Up @@ -41,6 +43,7 @@
using Microsoft.Azure.Management.Graph.RBAC.Fluent.Models;
using Microsoft.Azure.Management.Network.Fluent.Models;
using Microsoft.Azure.Management.ContainerInstance.Fluent;
using Microsoft.Azure.Management.Locks.Fluent;

namespace Microsoft.Azure.Management.Samples.Common
{
Expand Down Expand Up @@ -164,7 +167,12 @@ public static void PrintAppGateway(IApplicationGateway resource)
.Append("\n\t\t\tCookie based affinity: ").Append(httpConfig.CookieBasedAffinity)
.Append("\n\t\t\tPort: ").Append(httpConfig.Port)
.Append("\n\t\t\tRequest timeout in seconds: ").Append(httpConfig.RequestTimeout)
.Append("\n\t\t\tProtocol: ").Append(httpConfig.Protocol.ToString());
.Append("\n\t\t\tProtocol: ").Append(httpConfig.Protocol.ToString())
.Append("\n\t\tHost header: ").Append(httpConfig.HostHeader)
.Append("\n\t\tHost header comes from backend? ").Append(httpConfig.IsHostHeaderFromBackend)
.Append("\n\t\tConnection draining timeout in seconds: ").Append(httpConfig.ConnectionDrainingTimeoutInSeconds)
.Append("\n\t\tAffinity cookie name: ").Append(httpConfig.AffinityCookieName)
.Append("\n\t\tPath: ").Append(httpConfig.Path);

var probe = httpConfig.Probe;
if (probe != null)
Expand All @@ -182,6 +190,20 @@ public static void PrintAppGateway(IApplicationGateway resource)
.Append("\n\t\t\tCert data: ").Append(cert.PublicData);
}

// Show redirect configurations
var redirects = resource.RedirectConfigurations;
info.Append("\n\tRedirect configurations: ").Append(redirects.Count);
foreach (IApplicationGatewayRedirectConfiguration redirect in redirects.Values)
{
info.Append("\n\t\tName: ").Append(redirect.Name)
.Append("\n\t\tTarget URL: ").Append(redirect.Type)
.Append("\n\t\tTarget URL: ").Append(redirect.TargetUrl)
.Append("\n\t\tTarget listener: ").Append(redirect.TargetListener?.Name)
.Append("\n\t\tIs path included? ").Append(redirect.IsPathIncluded)
.Append("\n\t\tIs query string included? ").Append(redirect.IsQueryStringIncluded)
.Append("\n\t\tReferencing request routing rules: ").Append(string.Join(", ", redirect.RequestRoutingRules.Keys.ToArray()));
}

// Show HTTP listeners
var listeners = resource.Listeners;
info.Append("\n\tHTTP listeners: ").Append(listeners.Count);
Expand Down Expand Up @@ -213,7 +235,8 @@ public static void PrintAppGateway(IApplicationGateway resource)
.Append("\n\t\t\tFrontend port: ").Append(rule.FrontendPort)
.Append("\n\t\t\tFrontend protocol: ").Append(rule.FrontendProtocol.ToString())
.Append("\n\t\t\tBackend port: ").Append(rule.BackendPort)
.Append("\n\t\t\tCookie based affinity enabled? ").Append(rule.CookieBasedAffinity);
.Append("\n\t\t\tCookie based affinity enabled? ").Append(rule.CookieBasedAffinity)
.Append("\n\t\tRedirect configuration: ").Append(rule.RedirectConfiguration?.Name ?? "(none)");

// Show backend addresses
var addresses = rule.BackendAddresses;
Expand All @@ -225,53 +248,19 @@ public static void PrintAppGateway(IApplicationGateway resource)
.Append(" [").Append(address.IpAddress).Append("]");
}

// Show SSL cert
info.Append("\n\t\t\tSSL certificate name: ");
var cert = rule.SslCertificate;
if (cert == null)
{
info.Append("(None)");
}
else
{
info.Append(cert.Name);
}

info
// Show SSL cert
.Append("\n\t\t\tSSL certificate name: ").Append(rule.SslCertificate?.Name ?? "(none)")

// Show backend
info.Append("\n\t\t\tAssociated backend address pool: ");
var backend = rule.Backend;
if (backend == null)
{
info.Append("(None)");
}
else
{
info.Append(backend.Name);
}
// Show backend
.Append("\n\t\t\tAssociated backend address pool: ").Append(rule.Backend?.Name ?? "(none)")

// Show backend HTTP settings config
info.Append("\n\t\t\tAssociated backend HTTP settings configuration: ");
var config = rule.BackendHttpConfiguration;
if (config == null)
{
info.Append("(None)");
}
else
{
info.Append(config.Name);
}
// Show backend HTTP settings config
.Append("\n\t\t\tAssociated backend HTTP settings configuration: ").Append(rule.BackendHttpConfiguration?.Name ?? "(none)")

// Show frontend listener
info.Append("\n\t\t\tAssociated frontend listener: ");
var listener = rule.Listener;
if (listener == null)
{
info.Append("(None)");
}
else
{
info.Append(config.Name);
}
// Show frontend listener
.Append("\n\t\t\tAssociated frontend listener: ").Append(rule.Listener?.Name ?? "(none)");
}

// Show probes
Expand All @@ -284,7 +273,9 @@ public static void PrintAppGateway(IApplicationGateway resource)
.Append("\n\t\tInterval in seconds: ").Append(probe.TimeBetweenProbesInSeconds)
.Append("\n\t\tRetries: ").Append(probe.RetriesBeforeUnhealthy)
.Append("\n\t\tTimeout: ").Append(probe.TimeoutInSeconds)
.Append("\n\t\tHost: ").Append(probe.Host);
.Append("\n\t\tHost: ").Append(probe.Host)
.Append("\n\t\tHealthy HTTP response status code ranges: ").Append(probe.HealthyHttpResponseStatusCodeRanges)
.Append("\n\t\tHealthy HTTP response body contents: ").Append(probe.HealthyHttpResponseBodyContents);
}

Utilities.Log(info.ToString());
Expand All @@ -310,7 +301,7 @@ public static void Print(ITopicAuthorizationRule topicAuthorizationRule)
Log(builder.ToString());
}

public static void Print(Search.Fluent.ISearchService searchService)
public static void Print(ISearchService searchService)
{
var adminKeys = searchService.GetAdminKeys();
var queryKeys = searchService.ListQueryKeys();
Expand Down Expand Up @@ -459,6 +450,15 @@ public static void Print(IQueue queue)
Utilities.Log(builder.ToString());
}

public static void Print(IManagementLock l)
{
StringBuilder info = new StringBuilder();
info.Append("\nLock ID: ").Append(l.Id)
.Append("\nLocked resource ID: ").Append(l.LockedResourceId)
.Append("\nLevel: ").Append(l.Level);
Utilities.Log(info.ToString());
}

public static void Print(IServiceBusNamespace serviceBusNamespace)
{
var builder = new StringBuilder()
Expand Down Expand Up @@ -1219,12 +1219,12 @@ public static void Print(IWebAppBase resource)
}
}
builder = builder.Append("\n\tApp settings: ");
foreach (var setting in resource.AppSettings.Values)
foreach (var setting in resource.GetAppSettings().Values)
{
builder = builder.Append("\n\t\t" + setting.Key + ": " + setting.Value + (setting.Sticky ? " - slot setting" : ""));
}
builder = builder.Append("\n\tConnection strings: ");
foreach (var conn in resource.ConnectionStrings.Values)
foreach (var conn in resource.GetConnectionStrings().Values)
{
builder = builder.Append("\n\t\t" + conn.Name + ": " + conn.Value + " - " + conn.Type + (conn.Sticky ? " - slot setting" : ""));
}
Expand Down Expand Up @@ -1583,13 +1583,13 @@ public static void Print(IRegistry azureRegistry)
{
StringBuilder info = new StringBuilder();

RegistryListCredentials acrCredentials = azureRegistry.ListCredentials();
var acrCredentials = azureRegistry.GetCredentials();
info.Append("Azure Container Registry: ").Append(azureRegistry.Id)
.Append("\n\tName: ").Append(azureRegistry.Name)
.Append("\n\tServer Url: ").Append(azureRegistry.LoginServerUrl)
.Append("\n\tUser: ").Append(acrCredentials.Username)
.Append("\n\tFirst Password: ").Append(acrCredentials.Passwords[0].Value)
.Append("\n\tSecond Password: ").Append(acrCredentials.Passwords[1].Value);
.Append("\n\tFirst Password: ").Append(acrCredentials.AccessKeys[AccessKeyType.Primary])
.Append("\n\tSecond Password: ").Append(acrCredentials.AccessKeys[AccessKeyType.Secondary]);
Log(info.ToString());
}

Expand Down Expand Up @@ -1683,7 +1683,7 @@ public static void Print(IContainerGroup containerGroup)
* Print an Azure Container Service.
* @param containerService an Azure Container Service
*/
public static void Print(IContainerService containerService)
public static void Print(ContainerService.Fluent.IContainerService containerService)
{
StringBuilder info = new StringBuilder();

Expand All @@ -1692,22 +1692,44 @@ public static void Print(IContainerService containerService)
.Append("\n\tWith orchestration: ").Append(containerService.OrchestratorType.ToString())
.Append("\n\tMaster FQDN: ").Append(containerService.MasterFqdn)
.Append("\n\tMaster node count: ").Append(containerService.MasterNodeCount)
.Append("\n\tMaster leaf domain label: ").Append(containerService.MasterLeafDomainLabel)
.Append("\n\t\tWith Agent pool name: ").Append(containerService.AgentPoolName)
.Append("\n\t\tAgent pool count: ").Append(containerService.AgentPoolCount)
.Append("\n\t\tAgent pool count: ").Append(containerService.AgentPoolVMSize.ToString())
.Append("\n\t\tAgent pool FQDN: ").Append(containerService.AgentPoolFqdn)
.Append("\n\t\tAgent pool leaf domain label: ").Append(containerService.AgentPoolLeafDomainLabel)
.Append("\n\tMaster leaf domain label: ").Append(containerService.MasterDnsPrefix)
.Append("\n\t\tWith Agent pool name: ").Append(containerService.AgentPools.First().Value.Name)
.Append("\n\t\tAgent pool count: ").Append(containerService.AgentPools.First().Value.Count)
.Append("\n\t\tAgent virtual machine size: ").Append(containerService.AgentPools.First().Value.VMSize.ToString())
.Append("\n\t\tAgent pool FQDN: ").Append(containerService.AgentPools.First().Value.Fqdn)
.Append("\n\t\tAgent DNS prefix: ").Append(containerService.AgentPools.First().Value.DnsPrefix)
.Append("\n\tLinux user name: ").Append(containerService.LinuxRootUsername)
.Append("\n\tSSH key: ").Append(containerService.SshKey);
if (containerService.OrchestratorType == ContainerServiceOrchestratorTypes.Kubernetes)
if (containerService.OrchestratorType == ContainerService.Fluent.Models.ContainerServiceOrchestratorTypes.Kubernetes)
{
info.Append("\n\tName: ").Append(containerService.ServicePrincipalClientId);
info.Append("\n\tService Principal ID: ").Append(containerService.ServicePrincipalClientId);
}

Log(info.ToString());
}

/**
* Print a Kubernetes cluster.
* @param kubernetesCluster a Kubernetes cluster instance
*/
public static void Print(ContainerService.Fluent.IKubernetesCluster kubernetesCluster)
{
StringBuilder info = new StringBuilder();

info.Append("Azure Container Service: ").Append(kubernetesCluster.Id)
.Append("\n\tName: ").Append(kubernetesCluster.Name)
.Append("\n\tFQDN: ").Append(kubernetesCluster.Fqdn)
.Append("\n\tDNS prefix: ").Append(kubernetesCluster.DnsPrefix)
.Append("\n\t\tWith Agent pool name: ").Append(kubernetesCluster.AgentPools.First().Value.Name)
.Append("\n\t\tAgent pool count: ").Append(kubernetesCluster.AgentPools.First().Value.Count)
.Append("\n\t\tAgent virtual machine size: ").Append(kubernetesCluster.AgentPools.First().Value.VMSize.ToString())
.Append("\n\tLinux user name: ").Append(kubernetesCluster.LinuxRootUsername)
.Append("\n\tSSH key: ").Append(kubernetesCluster.SshKey)
.Append("\n\tService principal ID: ").Append(kubernetesCluster.ServicePrincipalClientId);

Log(info.ToString());
}

/**
* Retrieve the secondary service principal client ID.
* @param envSecondaryServicePrincipal an Azure Container Registry
Expand Down Expand Up @@ -2228,6 +2250,37 @@ public static void UploadFilesToContainer(string connectionString, string contai
}
}

public static void CreateContainer(string connectionString, string containerName)
{
if (!IsRunningMocked)
{
CloudStorageAccount storageAccount;
try
{
storageAccount = CloudStorageAccount.Parse(connectionString);
}
catch (FormatException)
{
Utilities.Log("Invalid storage account information provided. Please confirm the AccountName and AccountKey are valid in the app.config file - then restart the sample.");
Utilities.ReadLine();
throw;
}
catch (ArgumentException)
{
Utilities.Log("Invalid storage account information provided. Please confirm the AccountName and AccountKey are valid in the app.config file - then restart the sample.");
Utilities.ReadLine();
throw;
}
// Create a blob client for interacting with the blob service.
var blobClient = storageAccount.CreateCloudBlobClient();
// Create a container for organizing blobs within the storage account.
Utilities.Log("Creating Container");
var container = blobClient.GetContainerReference(containerName);
container.CreateIfNotExistsAsync().GetAwaiter().GetResult();
}
}


public static void DeployByGit(IPublishingProfile profile, string repository)
{
if (!IsRunningMocked)
Expand Down
2 changes: 1 addition & 1 deletion ManageVirtualMachineScaleSetAsync.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
<PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.3.0" />
<PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.4.1" />
<PackageReference Include="CoreFTP" Version="1.2.0" />
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="0.0.2-preview" />
<PackageReference Include="SSH.NET" Version="2016.0.0" />
Expand Down

0 comments on commit e3a8ab1

Please sign in to comment.