Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history 
Conflicts:
	clients/vmClient/vmClient.go
  • Loading branch information
@ruslangabitov
ruslangabitov committed Oct 17, 2014
2 parents 7daeb26 + c25453f commit 8a1a75e
Showing 1 changed file with 98 additions and 25 deletions.
123 changes: 98 additions & 25 deletions clients/vmClient/vmClient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,20 @@ import (
"encoding/xml"
"errors"
"fmt"
azure "github.com/MSOpenTech/azure-sdk-for-go"
"github.com/MSOpenTech/azure-sdk-for-go/clients/imageClient"
"github.com/MSOpenTech/azure-sdk-for-go/clients/locationClient"
"github.com/MSOpenTech/azure-sdk-for-go/clients/storageServiceClient"
"github.com/MSOpenTech/azure-sdk-for-go/clients/vmDiskClient"
"io"
"io/ioutil"
"os"
"os/user"
"path"
"strings"
"time"
"unicode"

azure "github.com/MSOpenTech/azure-sdk-for-go"
"github.com/MSOpenTech/azure-sdk-for-go/clients/imageClient"
"github.com/MSOpenTech/azure-sdk-for-go/clients/locationClient"
"github.com/MSOpenTech/azure-sdk-for-go/clients/storageServiceClient"
"github.com/MSOpenTech/azure-sdk-for-go/clients/vmDiskClient"
)

const (
Expand All @@ -44,11 +46,17 @@ const (
provisioningConfDoesNotExistsError = "You should set azure VM provisioning config first"
invalidCertExtensionError = "Certificate %s is invalid. Please specify %s certificate."
invalidOSError = "You must specify correct OS param. Valid values are 'Linux' and 'Windows'"
invalidDnsLengthError = "The DNS name must be between 3 and 25 characters."
invalidPasswordLengthError = "Password must be between 4 and 30 characters."
invalidPasswordError = "Password must have at least one upper case, lower case and numeric character."
)

//Region public methods starts

func CreateAzureVM(role *Role, dnsName, location string) error {
func CreateAzureVM(azureVMConfiguration *Role, dnsName, location string) error {
if azureVMConfiguration == nil {
return fmt.Errorf(azure.ParamNotSpecifiedError, "azureVMConfiguration")
}
if len(dnsName) == 0 {
return fmt.Errorf(azure.ParamNotSpecifiedError, "dnsName")
}
Expand All @@ -57,31 +65,37 @@ func CreateAzureVM(role *Role, dnsName, location string) error {
}

fmt.Println("Creating hosted service... ")

err := verifyDNSname(dnsName)
if err != nil {
return err
}

requestId, err := CreateHostedService(dnsName, location)
if err != nil {
return err
}

azure.WaitAsyncOperation(requestId)

if role.UseCertAuth {
if azureVMConfiguration.UseCertAuth {
fmt.Println("Uploading cert...")

err = uploadServiceCert(dnsName, role.CertPath)
err = uploadServiceCert(dnsName, azureVMConfiguration.CertPath)
if err != nil {
return err
}
}

fmt.Println("Deploying azure VM configuration... ")

vMDeployment := createVMDeploymentConfig(role)
vMDeployment := createVMDeploymentConfig(azureVMConfiguration)
vMDeploymentBytes, err := xml.Marshal(vMDeployment)
if err != nil {
return err
}

requestURL := fmt.Sprintf(azureDeploymentListURL, role.RoleName)
requestURL := fmt.Sprintf(azureDeploymentListURL, azureVMConfiguration.RoleName)
requestId, err = azure.SendAzurePostRequest(requestURL, vMDeploymentBytes)
if err != nil {
return err
Expand All @@ -100,6 +114,11 @@ func CreateHostedService(dnsName, location string) (string, error) {
return "", fmt.Errorf(azure.ParamNotSpecifiedError, "location")
}

err := verifyDNSname(dnsName)
if err != nil {
return "", err
}

result, reason, err := CheckHostedServiceNameAvailability(dnsName)
if err != nil {
return "", err
Expand Down Expand Up @@ -133,6 +152,11 @@ func CheckHostedServiceNameAvailability(dnsName string) (bool, string, error) {
return false, "", fmt.Errorf(azure.ParamNotSpecifiedError, "dnsName")
}

err := verifyDNSname(dnsName)
if err != nil {
return false, "", err
}

requestURL := fmt.Sprintf(azureHostedServiceAvailabilityURL, dnsName)
response, err := azure.SendAzureGetRequest(requestURL)
if err != nil {
Expand All @@ -153,6 +177,11 @@ func DeleteHostedService(dnsName string) error {
return fmt.Errorf(azure.ParamNotSpecifiedError, "dnsName")
}

err := verifyDNSname(dnsName)
if err != nil {
return err
}

requestURL := fmt.Sprintf(azureHostedServiceURL, dnsName)
requestId, err := azure.SendAzureDeleteRequest(requestURL)
if err != nil {
Expand All @@ -163,9 +192,9 @@ func DeleteHostedService(dnsName string) error {
return nil
}

func CreateAzureVMConfiguration(name, instanceSize, imageName, location string) (*Role, error) {
if len(name) == 0 {
return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "name")
func CreateAzureVMConfiguration(dnsName, instanceSize, imageName, location string) (*Role, error) {
if len(dnsName) == 0 {
return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "dnsName")
}
if len(instanceSize) == 0 {
return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "instanceSize")
Expand All @@ -179,32 +208,36 @@ func CreateAzureVMConfiguration(name, instanceSize, imageName, location string)

fmt.Println("Creating azure VM configuration... ")

err := locationClient.ResolveLocation(location)
err := verifyDNSname(dnsName)
if err != nil {
return nil, err
}

err = locationClient.ResolveLocation(location)
if err != nil {
return nil, err
}

role, err := createAzureVMRole(name, instanceSize, imageName, location)
role, err := createAzureVMRole(dnsName, instanceSize, imageName, location)
if err != nil {
return nil, err
}

return role, nil
}

func AddAzureLinuxProvisioningConfig(azureVMConfig *Role, userName, password, certPath string) (*Role, error) {
func AddAzureLinuxProvisioningConfig(azureVMConfiguration *Role, userName, password, certPath string) (*Role, error) {
if azureVMConfiguration == nil {
return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "azureVMConfiguration")
}
if len(userName) == 0 {
return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "userName")
}
if len(password) == 0 {
return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "password")
}

fmt.Println("Adding azure provisioning configuration... ")

configurationSets := ConfigurationSets{}

provisioningConfig, err := createLinuxProvisioningConfig(azureVMConfig.RoleName, userName, password, certPath)
provisioningConfig, err := createLinuxProvisioningConfig(azureVMConfiguration.RoleName, userName, password, certPath)
if err != nil {
return nil, err
}
Expand All @@ -218,17 +251,20 @@ func AddAzureLinuxProvisioningConfig(azureVMConfig *Role, userName, password, ce

configurationSets.ConfigurationSet = append(configurationSets.ConfigurationSet, networkConfig)

azureVMConfig.ConfigurationSets = configurationSets
azureVMConfiguration.ConfigurationSets = configurationSets

if len(certPath) > 0 {
azureVMConfig.UseCertAuth = true
azureVMConfig.CertPath = certPath
azureVMConfiguration.UseCertAuth = true
azureVMConfiguration.CertPath = certPath
}

return azureVMConfig, nil
return azureVMConfiguration, nil
}

func SetAzureVMExtension(azureVMConfiguration *Role, name string, publisher string, version string, referenceName string, state string, publicConfigurationValue string, privateConfigurationValue string) (*Role, error) {
if azureVMConfiguration == nil {
return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "azureVMConfiguration")
}
if len(name) == 0 {
return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "name")
}
Expand Down Expand Up @@ -275,6 +311,9 @@ func SetAzureVMExtension(azureVMConfiguration *Role, name string, publisher stri
}

func SetAzureDockerVMExtension(azureVMConfiguration *Role, dockerCertDir string, dockerPort int, version string) (*Role, error) {
if azureVMConfiguration == nil {
return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "azureVMConfiguration")
}
if len(dockerCertDir) == 0 {
return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "dockerCertDir")
}
Expand Down Expand Up @@ -686,6 +725,11 @@ func createLinuxProvisioningConfig(dnsName, userName, userPassword, certPath str
disableSshPasswordAuthentication = true
// We need to set dummy password otherwise azure API will throw an error
userPassword = "P@ssword1"
} else {
err := verifyPassword(userPassword)
if err != nil {
return provisioningConfig, err
}
}

provisioningConfig.DisableSshPasswordAuthentication = disableSshPasswordAuthentication
Expand Down Expand Up @@ -818,4 +862,33 @@ func createEndpoint(name string, protocol string, extertalPort int, internalPort
return endpoint
}

func verifyDNSname(dns string) error {
if len(dns) < 3 || len(dns) > 25 {
return fmt.Errorf(invalidDnsLengthError)
}

return nil
}

func verifyPassword(password string) error {
if len(password) < 4 || len(password) > 30 {
return fmt.Errorf(invalidPasswordLengthError)
}

next:
for _, classes := range map[string][]*unicode.RangeTable{
"upper case": {unicode.Upper, unicode.Title},
"lower case": {unicode.Lower},
"numeric": {unicode.Number, unicode.Digit},
} {
for _, r := range password {
if unicode.IsOneOf(classes, r) {
continue next
}
}
return fmt.Errorf(invalidPasswordError)
}
return nil
}

//Region private methods ends

0 comments on commit 8a1a75e

Please sign in to comment.