Skip to content

Commit

Permalink
changes for 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Alva Bandy committed Apr 21, 2017
1 parent 090f625 commit 0a26b73
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 38 deletions.
171 changes: 136 additions & 35 deletions Common/Utilities.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
using Renci.SshNet;
using Microsoft.Azure.Management.ServiceBus.Fluent;
using Microsoft.Azure.ServiceBus;
using System.Threading;
using System.Net.Http.Headers;

namespace Microsoft.Azure.Management.Samples.Common
{
Expand Down Expand Up @@ -425,25 +427,25 @@ public static void PrintVirtualMachineCustomImage(IVirtualMachineCustomImage ima
.Append("\n\tCreated from virtual machine: ").Append(image.SourceVirtualMachineId);

builder.Append("\n\tOS disk image: ")
.Append("\n\t\tOperating system: ").Append(image.OsDiskImage.OsType)
.Append("\n\t\tOperating system state: ").Append(image.OsDiskImage.OsState)
.Append("\n\t\tCaching: ").Append(image.OsDiskImage.Caching)
.Append("\n\t\tSize (GB): ").Append(image.OsDiskImage.DiskSizeGB);
.Append("\n\t\tOperating system: ").Append(image.OSDiskImage.OsType)
.Append("\n\t\tOperating system state: ").Append(image.OSDiskImage.OsState)
.Append("\n\t\tCaching: ").Append(image.OSDiskImage.Caching)
.Append("\n\t\tSize (GB): ").Append(image.OSDiskImage.DiskSizeGB);
if (image.IsCreatedFromVirtualMachine)
{
builder.Append("\n\t\tSource virtual machine: ").Append(image.SourceVirtualMachineId);
}
if (image.OsDiskImage.ManagedDisk != null)
if (image.OSDiskImage.ManagedDisk != null)
{
builder.Append("\n\t\tSource managed disk: ").Append(image.OsDiskImage.ManagedDisk.Id);
builder.Append("\n\t\tSource managed disk: ").Append(image.OSDiskImage.ManagedDisk.Id);
}
if (image.OsDiskImage.Snapshot != null)
if (image.OSDiskImage.Snapshot != null)
{
builder.Append("\n\t\tSource snapshot: ").Append(image.OsDiskImage.Snapshot.Id);
builder.Append("\n\t\tSource snapshot: ").Append(image.OSDiskImage.Snapshot.Id);
}
if (image.OsDiskImage.BlobUri != null)
if (image.OSDiskImage.BlobUri != null)
{
builder.Append("\n\t\tSource un-managed vhd: ").Append(image.OsDiskImage.BlobUri);
builder.Append("\n\t\tSource un-managed vhd: ").Append(image.OSDiskImage.BlobUri);
}
if (image.DataDiskImages != null)
{
Expand Down Expand Up @@ -550,26 +552,26 @@ public static void PrintVirtualMachine(IVirtualMachine virtualMachine)
}
}
StringBuilder osProfile;
if (virtualMachine.OsProfile != null)
if (virtualMachine.OSProfile != null)
{
osProfile = new StringBuilder().Append("\n\tOSProfile: ");

osProfile.Append("\n\t\tComputerName:").Append(virtualMachine.OsProfile.ComputerName);
if (virtualMachine.OsProfile.WindowsConfiguration != null)
osProfile.Append("\n\t\tComputerName:").Append(virtualMachine.OSProfile.ComputerName);
if (virtualMachine.OSProfile.WindowsConfiguration != null)
{
osProfile.Append("\n\t\t\tWindowsConfiguration: ");
osProfile.Append("\n\t\t\t\tProvisionVMAgent: ")
.Append(virtualMachine.OsProfile.WindowsConfiguration.ProvisionVMAgent);
.Append(virtualMachine.OSProfile.WindowsConfiguration.ProvisionVMAgent);
osProfile.Append("\n\t\t\t\tEnableAutomaticUpdates: ")
.Append(virtualMachine.OsProfile.WindowsConfiguration.EnableAutomaticUpdates);
.Append(virtualMachine.OSProfile.WindowsConfiguration.EnableAutomaticUpdates);
osProfile.Append("\n\t\t\t\tTimeZone: ")
.Append(virtualMachine.OsProfile.WindowsConfiguration.TimeZone);
.Append(virtualMachine.OSProfile.WindowsConfiguration.TimeZone);
}
if (virtualMachine.OsProfile.LinuxConfiguration != null)
if (virtualMachine.OSProfile.LinuxConfiguration != null)
{
osProfile.Append("\n\t\t\tLinuxConfiguration: ");
osProfile.Append("\n\t\t\t\tDisablePasswordAuthentication: ")
.Append(virtualMachine.OsProfile.LinuxConfiguration.DisablePasswordAuthentication);
.Append(virtualMachine.OSProfile.LinuxConfiguration.DisablePasswordAuthentication);
}
}
else
Expand Down Expand Up @@ -597,7 +599,7 @@ public static void PrintVirtualMachine(IVirtualMachine virtualMachine)
.ToString());
}

public static void PrintStorageAccountKeys(IList<StorageAccountKey> storageAccountKeys)
public static void PrintStorageAccountKeys(IReadOnlyList<StorageAccountKey> storageAccountKeys)
{
foreach (var storageAccountKey in storageAccountKeys)
{
Expand Down Expand Up @@ -1515,7 +1517,7 @@ public static void CreateCertificate(string domainName, string pfxPath, string p
}
}

public static void UploadFileToFtp(IPublishingProfile profile, string filePath)
public static void UploadFileToFtp(IPublishingProfile profile, string filePath, string fileName = null)
{
if (!IsRunningMocked)
{
Expand All @@ -1530,9 +1532,36 @@ public static void UploadFileToFtp(IPublishingProfile profile, string filePath)
{
var fileinfo = new FileInfo(filePath);
ftpClient.LoginAsync().GetAwaiter().GetResult();
ftpClient.ChangeWorkingDirectoryAsync("./site/wwwroot/webapps").GetAwaiter().GetResult();
if (!ftpClient.ListDirectoriesAsync().GetAwaiter().GetResult().Any(fni => fni.Name == "site"))
{
ftpClient.CreateDirectoryAsync("site").GetAwaiter().GetResult();
}
ftpClient.ChangeWorkingDirectoryAsync("./site").GetAwaiter().GetResult();
if (!ftpClient.ListDirectoriesAsync().GetAwaiter().GetResult().Any(fni => fni.Name == "wwwroot"))
{
ftpClient.CreateDirectoryAsync("wwwroot").GetAwaiter().GetResult();
}
ftpClient.ChangeWorkingDirectoryAsync("./wwwroot").GetAwaiter().GetResult();
if (!ftpClient.ListDirectoriesAsync().GetAwaiter().GetResult().Any(fni => fni.Name == "webapps"))
{
ftpClient.CreateDirectoryAsync("webapps").GetAwaiter().GetResult();
}
ftpClient.ChangeWorkingDirectoryAsync("./webapps").GetAwaiter().GetResult();

using (var writeStream = ftpClient.OpenFileWriteStreamAsync(Path.GetFileName(filePath)).GetAwaiter().GetResult())
if (fileName == null)
{
fileName = Path.GetFileName(filePath);
}
while (fileName.Contains("/"))
{
int slash = fileName.IndexOf("/");
string subDir = fileName.Substring(0, slash);
ftpClient.CreateDirectoryAsync(subDir).GetAwaiter().GetResult();
ftpClient.ChangeWorkingDirectoryAsync("./" + subDir);
fileName = fileName.Substring(slash + 1);
}

using (var writeStream = ftpClient.OpenFileWriteStreamAsync(fileName).GetAwaiter().GetResult())
{
var fileReadStream = fileinfo.OpenRead();
fileReadStream.CopyToAsync(writeStream).GetAwaiter().GetResult();
Expand Down Expand Up @@ -1586,7 +1615,7 @@ public static void UploadFilesToContainer(string connectionString, string contai
}
}

public static void DeployByGit(IPublishingProfile profile)
public static void DeployByGit(IPublishingProfile profile, string repository)
{
if (!IsRunningMocked)
{
Expand All @@ -1597,7 +1626,7 @@ public static void DeployByGit(IPublishingProfile profile)
string gitPushArgument = $"push https://{profile.GitUsername}:{profile.GitPassword}@{profile.GitUrl} master:master -f";

ProcessStartInfo info = new ProcessStartInfo(gitCommand, gitInitArgument);
info.WorkingDirectory = Path.Combine(ProjectPath, "Asset", "azure-samples-appservice-helloworld");
info.WorkingDirectory = Path.Combine(ProjectPath, "Asset", repository);
Process.Start(info).WaitForExit();
info.Arguments = gitAddArgument;
Process.Start(info).WaitForExit();
Expand All @@ -1608,15 +1637,22 @@ public static void DeployByGit(IPublishingProfile profile)
}
}

public static string CheckAddress(string url)
public static string CheckAddress(string url, IDictionary<string, string> headers = null)
{
if (!IsRunningMocked)
{
try
{
using (var client = new HttpClient())
{
return client.GetAsync(url).Result.ToString();
if (headers != null)
{
foreach (var header in headers)
{
client.DefaultRequestHeaders.Add(header.Key, header.Value);
}
}
return client.GetAsync(url).Result.Content.ReadAsStringAsync().GetAwaiter().GetResult();
}
}
catch(Exception ex)
Expand All @@ -1628,30 +1664,45 @@ public static string CheckAddress(string url)
return "[Running in PlaybackMode]";
}

public static void DeprovisionAgentInLinuxVM(string host, int port, string userName, string password)
public static string PostAddress(string url, string body, IDictionary<string, string> headers = null)
{
if (!IsRunningMocked)
{
try
{
using (var sshClient = new SshClient(host, port, userName, password))
using (var client = new HttpClient())
{
Utilities.Log("Trying to de-provision: " + host);
sshClient.Connect();
var commandToExecute = "sudo waagent -deprovision+user --force";
using (var command = sshClient.CreateCommand(commandToExecute))
if (headers != null)
{
var commandOutput = command.Execute();
Utilities.Log(commandOutput);
foreach (var header in headers)
{
client.DefaultRequestHeaders.Add(header.Key, header.Value);
}
}
sshClient.Disconnect();
return client.PostAsync(url, new StringContent(body)).Result.ToString();
}
}
catch (Exception ex)
{
Utilities.Log(ex);
}
}

return "[Running in PlaybackMode]";
}

public static void DeprovisionAgentInLinuxVM(string host, int port, string userName, string password)
{
if (!IsRunningMocked)
{
Console.WriteLine("Trying to de-provision: " + host);
Console.WriteLine("ssh connection status: " + TrySsh(
host,
port,
userName,
password,
"sudo waagent -deprovision+user --force"));
}
}

public static string GetArmTemplate(string templateFileName)
Expand Down Expand Up @@ -1715,5 +1766,55 @@ public static void SendMessageToQueue(string connectionString, string queueName,
}
}
}

private static string TrySsh(
string host,
int port,
string userName,
string password,
string commandToExecute)
{
string commandOutput = null;
var backoffTime = 30 * 1000;
var retryCount = 3;

while (retryCount > 0)
{
using (var sshClient = new SshClient(host, port, userName, password))
{
try
{
sshClient.Connect();
if (commandToExecute != null)
{
using (var command = sshClient.CreateCommand(commandToExecute))
{
commandOutput = command.Execute();
}
}
break;
}
catch (Exception exception)
{
retryCount--;
if (retryCount == 0)
{
throw exception;
}
}
finally
{
try
{
sshClient.Disconnect();
}
catch { }
}
}
Thread.Sleep(backoffTime);
}

return commandOutput;
}
}
}
2 changes: 1 addition & 1 deletion ManageVirtualMachineScaleSetAsync.xproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>0a1687b6-7643-4253-8250-f7cec860f719</ProjectGuid>
<ProjectGuid>8e99e20d-e445-4b6e-af56-e97336e7a596</ProjectGuid>
<RootNamespace>ManageVirtualMachineScaleSetAsync</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
Expand Down
2 changes: 1 addition & 1 deletion Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ public static void Main(string[] args)

var azure = Azure
.Configure()
.WithLogLevel(HttpLoggingDelegatingHandler.Level.BASIC)
.WithLogLevel(HttpLoggingDelegatingHandler.Level.Basic)
.Authenticate(credentials)
.WithDefaultSubscription();

Expand Down
6 changes: 5 additions & 1 deletion project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.Azure.Management.Fluent": "1.0.0-beta50",
"Microsoft.Azure.Management.Fluent": "1.0.0",
"Microsoft.Azure.ServiceBus": "0.0.2-preview",
"CoreFTP": "1.2.0",
"SSH.NET": "2016.0.0",
"WindowsAzure.Storage": "8.0.1",
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
Expand Down

0 comments on commit 0a26b73

Please sign in to comment.