From 6fd891f5e29ef85f67165fc184a7ba7ada34e61d Mon Sep 17 00:00:00 2001 From: James Bardin Date: Fri, 24 Feb 2017 11:01:07 -0500 Subject: [PATCH] Make sure all azure-sdk packages match The containerservice package fell behind the others. Fix the vendor.json file to match the vendored packages. --- .../arm/containerservice/client.go | 2 +- .../arm/containerservice/containerservices.go | 58 +++++++++---------- .../arm/containerservice/models.go | 4 +- .../arm/containerservice/version.go | 37 ++++++++---- vendor/vendor.json | 14 ++--- 5 files changed, 61 insertions(+), 54 deletions(-) diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/client.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/client.go index b934d61c4..7508ecf28 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/client.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/client.go @@ -18,7 +18,7 @@ package containerservice // See the License for the specific language governing permissions and // limitations under the License. // -// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0 +// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0 // Changes may cause incorrect behavior and will be lost if the code is // regenerated. diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/containerservices.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/containerservices.go index 51fb9f368..297d20542 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/containerservices.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/containerservices.go @@ -14,7 +14,7 @@ package containerservice // See the License for the specific language governing permissions and // limitations under the License. // -// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0 +// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0 // Changes may cause incorrect behavior and will be lost if the code is // regenerated. @@ -43,15 +43,15 @@ func NewContainerServicesClientWithBaseURI(baseURI string, subscriptionID string } // CreateOrUpdate creates or updates a container service with the specified -// configuration of orchestrator, masters, and agents. This method may poll -// for completion. Polling can be canceled by passing the cancel channel -// argument. The channel will be used to cancel polling and any outstanding -// HTTP requests. +// configuration of orchestrator, masters, and agents. This method may poll for +// completion. Polling can be canceled by passing the cancel channel argument. +// The channel will be used to cancel polling and any outstanding HTTP +// requests. // -// resourceGroupName is the name of the resource group. containerServiceName -// is the name of the container service in the specified subscription and -// resource group. parameters is parameters supplied to the Create or Update -// a Container Service operation. +// resourceGroupName is the name of the resource group. containerServiceName is +// the name of the container service in the specified subscription and resource +// group. parameters is parameters supplied to the Create or Update a Container +// Service operation. func (client ContainerServicesClient) CreateOrUpdate(resourceGroupName string, containerServiceName string, parameters ContainerService, cancel <-chan struct{}) (result autorest.Response, err error) { if err := validation.Validate([]validation.Validation{ {TargetValue: parameters, @@ -63,9 +63,7 @@ func (client ContainerServicesClient) CreateOrUpdate(resourceGroupName string, c {Target: "parameters.Properties.ServicePrincipalProfile.Secret", Name: validation.Null, Rule: true, Chain: nil}, }}, {Target: "parameters.Properties.MasterProfile", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.Properties.MasterProfile.DNSPrefix", Name: validation.Null, Rule: true, Chain: nil}, - {Target: "parameters.Properties.MasterProfile.Fqdn", Name: validation.ReadOnly, Rule: true, Chain: nil}, - }}, + Chain: []validation.Constraint{{Target: "parameters.Properties.MasterProfile.DNSPrefix", Name: validation.Null, Rule: true, Chain: nil}}}, {Target: "parameters.Properties.AgentPoolProfiles", Name: validation.Null, Rule: true, Chain: nil}, {Target: "parameters.Properties.WindowsProfile", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Properties.WindowsProfile.AdminUsername", Name: validation.Null, Rule: true, @@ -81,11 +79,8 @@ func (client ContainerServicesClient) CreateOrUpdate(resourceGroupName string, c }}, {Target: "parameters.Properties.DiagnosticsProfile", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.Properties.DiagnosticsProfile.VMDiagnostics", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.Properties.DiagnosticsProfile.VMDiagnostics.Enabled", Name: validation.Null, Rule: true, Chain: nil}, - {Target: "parameters.Properties.DiagnosticsProfile.VMDiagnostics.StorageURI", Name: validation.ReadOnly, Rule: true, Chain: nil}, - }}, + Chain: []validation.Constraint{{Target: "parameters.Properties.DiagnosticsProfile.VMDiagnostics.Enabled", Name: validation.Null, Rule: true, Chain: nil}}}, }}, - {Target: "parameters.Properties.ProvisioningState", Name: validation.ReadOnly, Rule: true, Chain: nil}, }}}}}); err != nil { return result, validation.NewErrorWithValidationError(err, "containerservice.ContainerServicesClient", "CreateOrUpdate") } @@ -151,18 +146,18 @@ func (client ContainerServicesClient) CreateOrUpdateResponder(resp *http.Respons return } -// Delete deletes the specified container service in the specified -// subscription and resource group. The operation does not delete other -// resources created as part of creating a container service, including -// storage accounts, VMs, and availability sets. All the other resources -// created with the container service are part of the same resource group and -// can be deleted individually. This method may poll for completion. Polling -// can be canceled by passing the cancel channel argument. The channel will -// be used to cancel polling and any outstanding HTTP requests. +// Delete deletes the specified container service in the specified subscription +// and resource group. The operation does not delete other resources created as +// part of creating a container service, including storage accounts, VMs, and +// availability sets. All the other resources created with the container +// service are part of the same resource group and can be deleted individually. +// This method may poll for completion. Polling can be canceled by passing the +// cancel channel argument. The channel will be used to cancel polling and any +// outstanding HTTP requests. // -// resourceGroupName is the name of the resource group. containerServiceName -// is the name of the container service in the specified subscription and -// resource group. +// resourceGroupName is the name of the resource group. containerServiceName is +// the name of the container service in the specified subscription and resource +// group. func (client ContainerServicesClient) Delete(resourceGroupName string, containerServiceName string, cancel <-chan struct{}) (result autorest.Response, err error) { req, err := client.DeletePreparer(resourceGroupName, containerServiceName, cancel) if err != nil { @@ -228,9 +223,9 @@ func (client ContainerServicesClient) DeleteResponder(resp *http.Response) (resu // including state, orchestrator, number of masters and agents, and FQDNs of // masters and agents. // -// resourceGroupName is the name of the resource group. containerServiceName -// is the name of the container service in the specified subscription and -// resource group. +// resourceGroupName is the name of the resource group. containerServiceName is +// the name of the container service in the specified subscription and resource +// group. func (client ContainerServicesClient) Get(resourceGroupName string, containerServiceName string) (result ContainerService, err error) { req, err := client.GetPreparer(resourceGroupName, containerServiceName) if err != nil { @@ -292,8 +287,7 @@ func (client ContainerServicesClient) GetResponder(resp *http.Response) (result // List gets a list of container services in the specified subscription. The // operation returns properties of each container service including state, -// orchestrator, number of masters and agents, and FQDNs of masters and -// agents. +// orchestrator, number of masters and agents, and FQDNs of masters and agents. func (client ContainerServicesClient) List() (result ListResult, err error) { req, err := client.ListPreparer() if err != nil { diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/models.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/models.go index 6564faf3a..ea7ad50dc 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/models.go @@ -14,7 +14,7 @@ package containerservice // See the License for the specific language governing permissions and // limitations under the License. // -// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0 +// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0 // Changes may cause incorrect behavior and will be lost if the code is // regenerated. @@ -218,7 +218,7 @@ type Properties struct { DiagnosticsProfile *DiagnosticsProfile `json:"diagnosticsProfile,omitempty"` } -// Resource is the resource model definition. +// Resource is the Resource model definition. type Resource struct { ID *string `json:"id,omitempty"` Name *string `json:"name,omitempty"` diff --git a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/version.go b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/version.go index 777d6bfaf..a49006052 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/arm/containerservice/version.go @@ -14,30 +14,47 @@ package containerservice // See the License for the specific language governing permissions and // limitations under the License. // -// Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0 +// Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0 // Changes may cause incorrect behavior and will be lost if the code is // regenerated. import ( + "bytes" "fmt" + "strings" ) const ( - major = "7" - minor = "0" - patch = "1" - // Always begin a "tag" with a dash (as per http://semver.org) - tag = "-beta" - semVerFormat = "%s.%s.%s%s" - userAgentFormat = "Azure-SDK-for-Go/%s arm-%s/%s" + major = "8" + minor = "0" + patch = "0" + tag = "beta" + userAgentFormat = "Azure-SDK-For-Go/%s arm-%s/%s" +) + +// cached results of UserAgent and Version to prevent repeated operations. +var ( + userAgent string + version string ) // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return fmt.Sprintf(userAgentFormat, Version(), "containerservice", "2016-09-30") + if userAgent == "" { + userAgent = fmt.Sprintf(userAgentFormat, Version(), "containerservice", "2016-09-30") + } + return userAgent } // Version returns the semantic version (see http://semver.org) of the client. func Version() string { - return fmt.Sprintf(semVerFormat, major, minor, patch, tag) + if version == "" { + versionBuilder := bytes.NewBufferString(fmt.Sprintf("%s.%s.%s", major, minor, patch)) + if tag != "" { + versionBuilder.WriteRune('-') + versionBuilder.WriteString(strings.TrimPrefix(tag, "-")) + } + version = string(versionBuilder.Bytes()) + } + return version } diff --git a/vendor/vendor.json b/vendor/vendor.json index cd396680e..e3efdb09e 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -42,22 +42,18 @@ "versionExact": "v8.0.1-beta" }, { - "checksumSHA1": "Amd1JuJVsI9wU3+KI4Ba4jBbxps=", + "checksumSHA1": "N5cEhrAIjNoOIwciU7M8XBxUBdk=", "comment": "v2.1.1-beta-8-gca4d906", "path": "github.com/Azure/azure-sdk-for-go/arm/containerservice", - "revision": "0984e0641ae43b89283223034574d6465be93bf4", - "revisionTime": "2016-11-30T22:29:01Z", - "version": "v7.0.1-beta", - "versionExact": "v7.0.1-beta" + "revision": "8e625d1702a32d01cef05a9252198d231c4af113", + "revisionTime": "2017-02-08T01:01:20Z" }, { - "checksumSHA1": "NJGBM6QQwUQEhaCBZlN9sCoaBZE=", + "checksumSHA1": "Amd1JuJVsI9wU3+KI4Ba4jBbxps=", "comment": "v2.1.1-beta-8-gca4d906", "path": "github.com/Azure/azure-sdk-for-go/arm/eventhub", "revision": "8e625d1702a32d01cef05a9252198d231c4af113", - "revisionTime": "2017-02-08T01:01:20Z", - "version": "v8.0.1-beta", - "versionExact": "v8.0.1-beta" + "revisionTime": "2017-02-08T01:01:20Z" }, { "checksumSHA1": "HqDiYte7S7N9SRNpPJE7U/cDw3c=",